diff options
| author | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-05 14:33:19 +0200 |
|---|---|---|
| committer | Thomas Müller <thomas.mueller@tmit.eu> | 2016-04-05 14:33:19 +0200 |
| commit | 90335ee2a1f214b32670ab2c65f8f87c95a71828 (patch) | |
| tree | 80b725ee532be83b0d3b03b2ef10ddb48f9c14b3 | |
| parent | 2a7e9f08ff5951c0fba8524ba76fe56ce95ada57 (diff) | |
| parent | 73a6664ca854d9e1040da88601aa5235eb97f8f5 (diff) | |
| download | nextcloud-server-90335ee2a1f214b32670ab2c65f8f87c95a71828.tar.gz nextcloud-server-90335ee2a1f214b32670ab2c65f8f87c95a71828.zip | |
Merge pull request #23040 from owncloud/mobile-css-loading
load mobile styles last, fix #19596
| -rw-r--r-- | lib/private/template.php | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/lib/private/template.php b/lib/private/template.php index 2653ae6086a..d39abdcd378 100644 --- a/lib/private/template.php +++ b/lib/private/template.php @@ -69,7 +69,7 @@ class OC_Template extends \OC\Template\Base { public function __construct( $app, $name, $renderAs = "", $registerCall = true ) { // Read the selected theme from the config file self::initTemplateEngine($renderAs); - + $theme = OC_Util::getTheme(); $requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : ''; @@ -93,7 +93,7 @@ class OC_Template extends \OC\Template\Base { */ public static function initTemplateEngine($renderAs) { if (self::$initTemplateEngineFirstRun){ - + //apps that started before the template initialization can load their own scripts/styles //so to make sure this scripts/styles here are loaded first we use OC_Util::addScript() with $prepend=true //meaning the last script/style in this list will be loaded first @@ -106,13 +106,13 @@ class OC_Template extends \OC\Template\Base { OC_Util::addStyle("tooltip",null,true); OC_Util::addStyle('jquery-ui-fixes',null,true); OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',null,true); + OC_Util::addStyle("mobile",null,true); OC_Util::addStyle("multiselect",null,true); OC_Util::addStyle("fixes",null,true); OC_Util::addStyle("global",null,true); OC_Util::addStyle("apps",null,true); OC_Util::addStyle("fonts",null,true); OC_Util::addStyle("icons",null,true); - OC_Util::addStyle("mobile",null,true); OC_Util::addStyle("header",null,true); OC_Util::addStyle("inputs",null,true); OC_Util::addStyle("styles",null,true); @@ -169,10 +169,10 @@ class OC_Template extends \OC\Template\Base { self::$initTemplateEngineFirstRun = false; } - + } - - + + /** * find the template with the given name * @param string $name of the template file (without suffix) |