yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Replaces yepnope.js with lazyload.js

Browse Source 
Solves the caching and multi-load of the same file problems - adds a bit
of promise-based loading logic ontop of ll.js to ensure order and count
This commit is contained in:
per ploug
2014-04-29 11:38:13 +02:00
parent e964d52548
commit 90bf600378
9 changed files with 148 additions and 135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/Umbraco.Web/UI/JavaScript/CssInitialization.cs
View File

@@ -14,7 +14,6 @@ namespace Umbraco.Web.UI.JavaScript
internal class CssInitialization : AssetInitialization
{
private readonly ManifestParser _parser;
public CssInitialization(ManifestParser parser)
{
_parser = parser;
@@ -57,7 +56,7 @@ namespace Umbraco.Web.UI.JavaScript
{
var sb = new StringBuilder();
foreach (var file in files)
sb.AppendFormat("{0}yepnope.injectCss('{1}');", Environment.NewLine, file);
sb.AppendFormat("{0}LazyLoad.css('{1}');", Environment.NewLine, file);
return sb.ToString();
}

1
src/Umbraco.Web/UI/JavaScript/JsInitialization.cs
View File

@@ -61,7 +61,6 @@ namespace Umbraco.Web.UI.JavaScript
}
return ParseMain(
noCache,
result.ToString(),
IOHelper.ResolveUrl(SystemDirectories.Umbraco));
}

10
src/Umbraco.Web/UI/JavaScript/JsInitialize.js
View File

@@ -1,13 +1,9 @@
[
'lib/jquery/jquery-ui-1.10.3.custom.min.js',
'lib/jquery/jquery-2.0.3.min.js',
'lib/angular/1.1.5/angular.min.js',
'lib/underscore/underscore.js',
/*
'lib/jquery/jquery-ui-1.10.3.custom.min.js',
'lib/jquery/jquery.ui.core.min.js',
'lib/jquery/jquery.ui.widget.min.js',
'lib/jquery/jquery.ui.mouse.min.js',
'lib/jquery/jquery.ui.sortable.min.js',
*/
'lib/angular/1.1.5/angular-cookies.min.js',
'lib/angular/1.1.5/angular-mobile.js',

26
src/Umbraco.Web/UI/JavaScript/Main.js
View File

@@ -1,22 +1,8 @@
"##JsNoCache##"
yepnope({
load: [
'lib/jquery/jquery-2.0.3.min.js',
'lib/angular/1.1.5/angular.min.js',
'lib/underscore/underscore.js',
],
complete: function () {
yepnope({
load: "##JsInitialize##",
complete: function () {
LazyLoad.js("##JsInitialize##", function () {
//we need to set the legacy UmbClientMgr path
UmbClientMgr.setUmbracoPath('"##UmbracoPath##"');
//we need to set the legacy UmbClientMgr path
UmbClientMgr.setUmbracoPath('"##UmbracoPath##"');
jQuery(document).ready(function () {
angular.bootstrap(document, ['umbraco']);
});
}
});
}
jQuery(document).ready(function () {
angular.bootstrap(document, ['umbraco']);
});
});