diff options
| author | Morris Jobke <morris.jobke@gmail.com> | 2014-02-21 20:37:10 +0100 |
|---|---|---|
| committer | Morris Jobke <morris.jobke@gmail.com> | 2014-02-21 20:37:10 +0100 |
| commit | 079d64ce750ac25a9562df75b663075304ab934a (patch) | |
| tree | 9f206984ce4a3f0ce05d633f306b7f724bd4f030 /core | |
| parent | a2000a15f87a4c8d38671565e29e42f666e7cb8c (diff) | |
| parent | e549977d0e2fd7afae5adb253038494247a27322 (diff) | |
| download | nextcloud-server-079d64ce750ac25a9562df75b663075304ab934a.tar.gz nextcloud-server-079d64ce750ac25a9562df75b663075304ab934a.zip | |
Merge pull request #7310 from owncloud/no-css-js-delivery-via-php
No css js delivery via php
Diffstat (limited to 'core')
| -rw-r--r-- | core/js/tags.js | 6 | ||||
| -rw-r--r-- | core/minimizer.php | 15 | ||||
| -rw-r--r-- | core/routes.php | 3 |
3 files changed, 3 insertions, 21 deletions
diff --git a/core/js/tags.js b/core/js/tags.js index 16dd3d4bf97..bc6d7b4e071 100644 --- a/core/js/tags.js +++ b/core/js/tags.js @@ -25,11 +25,11 @@ OC.Tags= { }); self.deleteButton = { text: t('core', 'Delete'), - click: function() {self._deleteTags(self, type, self._selectedIds())}, + click: function() {self._deleteTags(self, type, self._selectedIds())} }; self.addButton = { text: t('core', 'Add'), - click: function() {self._addTag(self, type, self.$taginput.val())}, + click: function() {self._addTag(self, type, self.$taginput.val())} }; self._fillTagList(type, self.$taglist); @@ -349,5 +349,5 @@ OC.Tags= { console.warn(response); }); } -} +}; diff --git a/core/minimizer.php b/core/minimizer.php deleted file mode 100644 index eeeddf86a81..00000000000 --- a/core/minimizer.php +++ /dev/null @@ -1,15 +0,0 @@ -<?php -session_write_close(); - -OC_App::loadApps(); - -if ($service == 'core.css') { - $minimizer = new OC_Minimizer_CSS(); - $files = OC_TemplateLayout::findStylesheetFiles(OC_Util::$coreStyles); - $minimizer->output($files, $service); -} -else if ($service == 'core.js') { - $minimizer = new OC_Minimizer_JS(); - $files = OC_TemplateLayout::findJavascriptFiles(OC_Util::$coreScripts); - $minimizer->output($files, $service); -} diff --git a/core/routes.php b/core/routes.php index f8454877e03..aea788bdc6b 100644 --- a/core/routes.php +++ b/core/routes.php @@ -100,9 +100,6 @@ $this->create('core_avatar_post_cropped', '/avatar/cropped') ->action('OC\Core\Avatar\Controller', 'postCroppedAvatar'); // Not specifically routed -$this->create('app_css', '/apps/{app}/{file}') - ->requirements(array('file' => '.*.css')) - ->action('OC', 'loadCSSFile'); $this->create('app_index_script', '/apps/{app}/') ->defaults(array('file' => 'index.php')) //->requirements(array('file' => '.*.php')) |