Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Nextcloud
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
TeDomum
Nextcloud
Commits
90335ee2
Commit
90335ee2
authored
8 years ago
by
Thomas Müller
Browse files
Options
Downloads
Plain Diff
Merge pull request #23040 from owncloud/mobile-css-loading
load mobile styles last, fix #19596
parents
2a7e9f08
73a6664c
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
lib/private/template.php
+6
-6
6 additions, 6 deletions
lib/private/template.php
with
6 additions
and
6 deletions
lib/private/template.php
+
6
−
6
View file @
90335ee2
...
...
@@ -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)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment