diff options
| -rw-r--r-- | apps/comments/appinfo/app.php | 8 | ||||
| -rw-r--r-- | apps/comments/js/merged.json | 9 | ||||
| -rw-r--r-- | apps/files/js/merged-index.json | 29 | ||||
| -rw-r--r-- | apps/files/lib/Controller/ViewController.php | 31 |
4 files changed, 40 insertions, 37 deletions
diff --git a/apps/comments/appinfo/app.php b/apps/comments/appinfo/app.php index 144a4506d38..067e01e47ef 100644 --- a/apps/comments/appinfo/app.php +++ b/apps/comments/appinfo/app.php @@ -26,13 +26,7 @@ $eventDispatcher->addListener( 'OCA\Files::loadAdditionalScripts', function() { \OCP\Util::addScript('oc-backbone-webdav'); - \OCP\Util::addScript('comments', 'app'); - \OCP\Util::addScript('comments', 'commentmodel'); - \OCP\Util::addScript('comments', 'commentcollection'); - \OCP\Util::addScript('comments', 'commentsummarymodel'); - \OCP\Util::addScript('comments', 'commentstabview'); - \OCP\Util::addScript('comments', 'filesplugin'); - \OCP\Util::addScript('comments', 'activitytabviewplugin'); + \OCP\Util::addScript('comments', 'merged'); \OCP\Util::addStyle('comments', 'comments'); } ); diff --git a/apps/comments/js/merged.json b/apps/comments/js/merged.json new file mode 100644 index 00000000000..66a63e88d17 --- /dev/null +++ b/apps/comments/js/merged.json @@ -0,0 +1,9 @@ +[ + "app.js", + "commentmodel.js", + "commentcollection.js", + "commentsummarymodel.js", + "commentstabview.js", + "filesplugin.js", + "activitytabviewplugin.js" +] diff --git a/apps/files/js/merged-index.json b/apps/files/js/merged-index.json new file mode 100644 index 00000000000..127bbb46b29 --- /dev/null +++ b/apps/files/js/merged-index.json @@ -0,0 +1,29 @@ +[ + "app.js", + "file-upload.js", + "newfilemenu.js", + "jquery.fileupload.js", + "jquery-visibility.js", + "fileinfomodel.js", + "filesummary.js", + "breadcrumb.js", + "filelist.js", + "search.js", + "favoritesfilelist.js", + "recentfilelist.js", + "tagsplugin.js", + "gotoplugin.js", + "favoritesplugin.js", + "recentplugin.js", + "detailfileinfoview.js", + "sidebarpreviewmanager.js", + "sidebarpreviewtext.js", + "detailtabview.js", + "mainfileinfodetailview.js", + "detailsview.js", + "fileactions.js", + "fileactionsmenu.js", + "files.js", + "keyboardshortcuts.js", + "navigation.js" +] diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index cfe66eb028b..499961ca2dc 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -152,37 +152,8 @@ class ViewController extends Controller { $nav = new \OCP\Template('files', 'appnavigation', ''); // Load the files we need - \OCP\Util::addScript('files', 'app'); - \OCP\Util::addScript('files', 'file-upload'); - \OCP\Util::addScript('files', 'newfilemenu'); - \OCP\Util::addScript('files', 'jquery.fileupload'); - \OCP\Util::addScript('files', 'jquery-visibility'); - \OCP\Util::addScript('files', 'fileinfomodel'); - \OCP\Util::addScript('files', 'filesummary'); - \OCP\Util::addScript('files', 'breadcrumb'); - \OCP\Util::addScript('files', 'filelist'); - \OCP\Util::addScript('files', 'search'); - - \OCP\Util::addScript('files', 'favoritesfilelist'); - \OCP\Util::addScript('files', 'recentfilelist'); - \OCP\Util::addScript('files', 'tagsplugin'); - \OCP\Util::addScript('files', 'gotoplugin'); - \OCP\Util::addScript('files', 'favoritesplugin'); - \OCP\Util::addScript('files', 'recentplugin'); - - \OCP\Util::addScript('files', 'detailfileinfoview'); - \OCP\Util::addScript('files', 'sidebarpreviewmanager'); - \OCP\Util::addScript('files', 'sidebarpreviewtext'); - \OCP\Util::addScript('files', 'detailtabview'); - \OCP\Util::addScript('files', 'mainfileinfodetailview'); - \OCP\Util::addScript('files', 'detailsview'); \OCP\Util::addStyle('files', 'merged'); - - \OCP\Util::addScript('files', 'fileactions'); - \OCP\Util::addScript('files', 'fileactionsmenu'); - \OCP\Util::addScript('files', 'files'); - \OCP\Util::addScript('files', 'keyboardshortcuts'); - \OCP\Util::addScript('files', 'navigation'); + \OCP\Util::addScript('files', 'merged-index'); // mostly for the home storage's free space // FIXME: Make non static |