diff options
| author | Lukas Reschke <lukas@statuscode.ch> | 2017-03-24 21:12:42 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-24 21:12:42 +0100 |
| commit | 4f73911bab1e8f4614104b751eda0ad4834e7c5e (patch) | |
| tree | 3159318684c15015ed4f13d9d5e5a349314fdd76 /apps | |
| parent | 3623431ac372b10e6613def018beb22d44a2e0d0 (diff) | |
| parent | a9c3692a9a11445b6efd7c986ed655b74990faa3 (diff) | |
| download | nextcloud-server-4f73911bab1e8f4614104b751eda0ad4834e7c5e.tar.gz nextcloud-server-4f73911bab1e8f4614104b751eda0ad4834e7c5e.zip | |
Merge pull request #4041 from nextcloud/merge-systemtags-js
Merge systemtags JS
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/systemtags/appinfo/app.php | 11 | ||||
| -rw-r--r-- | apps/systemtags/js/merged.json | 6 |
2 files changed, 8 insertions, 9 deletions
diff --git a/apps/systemtags/appinfo/app.php b/apps/systemtags/appinfo/app.php index bb2930e9197..099ce7f9b95 100644 --- a/apps/systemtags/appinfo/app.php +++ b/apps/systemtags/appinfo/app.php @@ -30,15 +30,8 @@ $eventDispatcher->addListener( function() { // FIXME: no public API for these ? \OCP\Util::addScript('oc-backbone-webdav'); - \OCP\Util::addScript('systemtags/systemtags'); - \OCP\Util::addScript('systemtags/systemtagmodel'); - \OCP\Util::addScript('systemtags/systemtagsmappingcollection'); - \OCP\Util::addScript('systemtags/systemtagscollection'); - \OCP\Util::addScript('systemtags/systemtagsinputfield'); - \OCP\Util::addScript('systemtags', 'app'); - \OCP\Util::addScript('systemtags', 'systemtagsfilelist'); - \OCP\Util::addScript('systemtags', 'filesplugin'); - \OCP\Util::addScript('systemtags', 'systemtagsinfoview'); + \OCP\Util::addScript('systemtags/merged'); + \OCP\Util::addScript('systemtags', 'merged'); \OCP\Util::addStyle('systemtags'); \OCP\Util::addStyle('systemtags', 'systemtagsfilelist'); } diff --git a/apps/systemtags/js/merged.json b/apps/systemtags/js/merged.json new file mode 100644 index 00000000000..0262077498a --- /dev/null +++ b/apps/systemtags/js/merged.json @@ -0,0 +1,6 @@ +[ + "app.js", + "systemtagsfilelist.js", + "filesplugin.js", + "systemtagsinfoview.js" +] |