load mobile styles last, fix #19596
This commit is contained in:
parent
961bb4c3e3
commit
73a6664ca8
|
@ -69,7 +69,7 @@ class OC_Template extends \OC\Template\Base {
|
||||||
public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
|
public function __construct( $app, $name, $renderAs = "", $registerCall = true ) {
|
||||||
// Read the selected theme from the config file
|
// Read the selected theme from the config file
|
||||||
self::initTemplateEngine($renderAs);
|
self::initTemplateEngine($renderAs);
|
||||||
|
|
||||||
$theme = OC_Util::getTheme();
|
$theme = OC_Util::getTheme();
|
||||||
|
|
||||||
$requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
|
$requestToken = (OC::$server->getSession() && $registerCall) ? \OCP\Util::callRegister() : '';
|
||||||
|
@ -93,7 +93,7 @@ class OC_Template extends \OC\Template\Base {
|
||||||
*/
|
*/
|
||||||
public static function initTemplateEngine($renderAs) {
|
public static function initTemplateEngine($renderAs) {
|
||||||
if (self::$initTemplateEngineFirstRun){
|
if (self::$initTemplateEngineFirstRun){
|
||||||
|
|
||||||
//apps that started before the template initialization can load their own scripts/styles
|
//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
|
//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
|
//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("tooltip",null,true);
|
||||||
OC_Util::addStyle('jquery-ui-fixes',null,true);
|
OC_Util::addStyle('jquery-ui-fixes',null,true);
|
||||||
OC_Util::addVendorStyle('jquery-ui/themes/base/jquery-ui',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("multiselect",null,true);
|
||||||
OC_Util::addStyle("fixes",null,true);
|
OC_Util::addStyle("fixes",null,true);
|
||||||
OC_Util::addStyle("global",null,true);
|
OC_Util::addStyle("global",null,true);
|
||||||
OC_Util::addStyle("apps",null,true);
|
OC_Util::addStyle("apps",null,true);
|
||||||
OC_Util::addStyle("fonts",null,true);
|
OC_Util::addStyle("fonts",null,true);
|
||||||
OC_Util::addStyle("icons",null,true);
|
OC_Util::addStyle("icons",null,true);
|
||||||
OC_Util::addStyle("mobile",null,true);
|
|
||||||
OC_Util::addStyle("header",null,true);
|
OC_Util::addStyle("header",null,true);
|
||||||
OC_Util::addStyle("inputs",null,true);
|
OC_Util::addStyle("inputs",null,true);
|
||||||
OC_Util::addStyle("styles",null,true);
|
OC_Util::addStyle("styles",null,true);
|
||||||
|
@ -169,10 +169,10 @@ class OC_Template extends \OC\Template\Base {
|
||||||
|
|
||||||
self::$initTemplateEngineFirstRun = false;
|
self::$initTemplateEngineFirstRun = false;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* find the template with the given name
|
* find the template with the given name
|
||||||
* @param string $name of the template file (without suffix)
|
* @param string $name of the template file (without suffix)
|
||||||
|
|
Loading…
Reference in New Issue