diff options
| author | Morris Jobke <hey@morrisjobke.de> | 2014-11-12 12:37:50 +0100 |
|---|---|---|
| committer | Morris Jobke <hey@morrisjobke.de> | 2014-11-12 13:07:23 +0100 |
| commit | 952abdc51ae19e05cf428e911d55de92c6ecc52f (patch) | |
| tree | a3d30cd5d3ec208db6581d33e25a05869a829944 /lib/private/template/jsresourcelocator.php | |
| parent | c998f620d0b19e3f832ca7a65134035cf81e6d6f (diff) | |
| download | nextcloud-server-952abdc51ae19e05cf428e911d55de92c6ecc52f.tar.gz nextcloud-server-952abdc51ae19e05cf428e911d55de92c6ecc52f.zip | |
Drop form_factor that is appended to JS, CSS and template filenames
Diffstat (limited to 'lib/private/template/jsresourcelocator.php')
| -rw-r--r-- | lib/private/template/jsresourcelocator.php | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/lib/private/template/jsresourcelocator.php b/lib/private/template/jsresourcelocator.php index 507f31327a6..5a6672429cf 100644 --- a/lib/private/template/jsresourcelocator.php +++ b/lib/private/template/jsresourcelocator.php @@ -13,15 +13,10 @@ class JSResourceLocator extends ResourceLocator { $theme_dir = 'themes/'.$this->theme.'/'; if (strpos($script, '3rdparty') === 0 && $this->appendIfExist($this->thirdpartyroot, $script.'.js') - || $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.$this->form_factor.'.js') || $this->appendIfExist($this->serverroot, $theme_dir.'apps/'.$script.'.js') - || $this->appendIfExist($this->serverroot, $theme_dir.$script.$this->form_factor.'.js') || $this->appendIfExist($this->serverroot, $theme_dir.$script.'.js') - || $this->appendIfExist($this->serverroot, $script.$this->form_factor.'.js') || $this->appendIfExist($this->serverroot, $script.'.js') - || $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.$this->form_factor.'.js') || $this->appendIfExist($this->serverroot, $theme_dir.'core/'.$script.'.js') - || $this->appendIfExist($this->serverroot, 'core/'.$script.$this->form_factor.'.js') || $this->appendIfExist($this->serverroot, 'core/'.$script.'.js') ) { return; @@ -30,9 +25,7 @@ class JSResourceLocator extends ResourceLocator { $script = substr($script, strpos($script, '/')+1); $app_path = \OC_App::getAppPath($app); $app_url = \OC_App::getAppWebPath($app); - if ($this->appendIfExist($app_path, $script.$this->form_factor.'.js', $app_url) - || $this->appendIfExist($app_path, $script.'.js', $app_url) - ) { + if ($this->appendIfExist($app_path, $script.'.js', $app_url)) { return; } // missing translations files fill be ignored |