Skip to content

Move systemtags to a proper location #21118

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 29, 2020
Merged

Move systemtags to a proper location #21118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 1 addition & 3 deletions apps/systemtags/templates/admin.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,9 +20,7 @@
*/

script('core', [
'systemtags/systemtags',
'systemtags/systemtagmodel',
'systemtags/systemtagscollection',
'dist/systemtags',
]);

script('systemtags', 'admin');
Expand Down
4 changes: 1 addition & 3 deletions apps/workflowengine/lib/AppInfo/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,9 +66,7 @@ class_exists(Template::class, true);
script('core', [
'files/fileinfo',
'files/client',
'systemtags/systemtags',
'systemtags/systemtagmodel',
'systemtags/systemtagscollection',
'dist/systemtags',
]);

script(self::APP_ID, [
Expand Down
8 changes: 1 addition & 7 deletions core/js/core.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,6 @@
"setupchecks.js",
"../search/js/search.js",
"mimetype.js",
"mimetypelist.js",
"systemtags/systemtags.js",
"systemtags/templates.js",
"systemtags/systemtagmodel.js",
"systemtags/systemtagscollection.js",
"systemtags/systemtagsmappingcollection.js",
"systemtags/systemtagsinputfield.js"
"mimetypelist.js"
]
}
9 changes: 8 additions & 1 deletion core/js/dist/systemtags.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion core/js/dist/systemtags.js.map
View file
Open in desktop

Large diffs are not rendered by default.

119 changes: 0 additions & 119 deletions core/js/systemtags/templates.js
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion core/js/systemtags/merged-systemtags.js → core/src/systemtags/merged-systemtags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
import './systemtags.js'
import './templates.js'
import './systemtagmodel.js'
import './systemtagsmappingcollection.js'
import './systemtagscollection.js'
Expand Down
0 core/js/systemtags/systemtagmodel.js → core/src/systemtags/systemtagmodel.js
View file
Open in desktop
File renamed without changes.
2 changes: 2 additions & 0 deletions core/js/systemtags/systemtags.js → core/src/systemtags/systemtags.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
*
*/

import escapeHTML from 'escape-html'

(function(OC) {
/**
* @namespace
Expand Down
0 core/js/systemtags/systemtagscollection.js → core/src/systemtags/systemtagscollection.js
View file
Open in desktop
File renamed without changes.
10 changes: 6 additions & 4 deletions core/js/systemtags/systemtagsinputfield.js → core/src/systemtags/systemtagsinputfield.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
*
*/

/* global Handlebars */
import templateResult from './templates/result.handlebars'
import templateResultForm from './templates/result_form.handlebars'
import templateSelection from './templates/selection.handlebars'

(function(OC) {

Expand Down Expand Up @@ -108,7 +110,7 @@
var tagModel = this.collection.get(tagId)

var oldName = tagModel.get('name')
var $renameForm = $(OC.SystemTags.Templates['result_form']({
var $renameForm = $(templateResultForm({
cid: this.cid,
name: oldName,
deleteTooltip: t('core', 'Delete'),
Expand Down Expand Up @@ -272,7 +274,7 @@
* @returns {string} HTML markup
*/
_formatDropDownResult: function(data) {
return OC.SystemTags.Templates['result'](_.extend({
return templateResult(_.extend({
renameTooltip: t('core', 'Rename'),
allowActions: this._allowActions,
tagMarkup: this._isAdmin ? OC.SystemTags.getDescriptiveTag(data)[0].innerHTML : null,
Expand All @@ -287,7 +289,7 @@
* @returns {string} HTML markup
*/
_formatSelection: function(data) {
return OC.SystemTags.Templates['selection'](_.extend({
return templateSelection(_.extend({
tagMarkup: this._isAdmin ? OC.SystemTags.getDescriptiveTag(data)[0].innerHTML : null,
isAdmin: this._isAdmin
}, data))
Expand Down
0 ...systemtags/systemtagsmappingcollection.js → ...systemtags/systemtagsmappingcollection.js
View file
Open in desktop
File renamed without changes.
0 ...js/systemtags/templates/result.handlebars → ...rc/systemtags/templates/result.handlebars
View file
Open in desktop
File renamed without changes.
0 ...stemtags/templates/result_form.handlebars → ...stemtags/templates/result_form.handlebars
View file
Open in desktop
File renamed without changes.
0 ...systemtags/templates/selection.handlebars → ...systemtags/templates/selection.handlebars
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion core/webpack.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ module.exports = [
},
{
entry: {
systemtags: path.resolve(__dirname, 'js/systemtags/merged-systemtags.js')
systemtags: path.resolve(__dirname, 'src/systemtags/merged-systemtags.js')
},
output: {
filename: '[name].js',
Expand Down
1 change: 1 addition & 0 deletions tests/karma.config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,7 @@ module.exports = function(config) {
files.push('core/js/dist/main.js');
files.push('core/js/dist/files_fileinfo.js');
files.push('core/js/dist/files_client.js');
files.push('core/js/dist/systemtags.js');
// core mocks
files.push(corePath + 'tests/specHelper.js');

Expand Down