mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #23040 from owncloud/mobile-css-loading 

load mobile styles last, fix #19596
This commit is contained in:
Thomas Müller 2016-04-05 14:33:19 +02:00
parent 2a7e9f08ff 73a6664ca8
commit 90335ee2a1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/private/template.php
View File

@ -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)