From 5749f80a7fbfb574735f20b3b43df9be8794f2c8 Mon Sep 17 00:00:00 2001 From: andydale1982 Date: Thu, 29 Oct 2015 17:10:39 +0000 Subject: [PATCH 1/2] Added instructions to manually install node_modules. --- src/Umbraco.Web.UI/Umbraco/js/install.loader.js | 11 +++++++++-- .../umbraco/Install/Views/Index.cshtml | 15 ++++++++++++++- 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/src/Umbraco.Web.UI/Umbraco/js/install.loader.js b/src/Umbraco.Web.UI/Umbraco/js/install.loader.js index 869521ec7d..f61c9d2878 100644 --- a/src/Umbraco.Web.UI/Umbraco/js/install.loader.js +++ b/src/Umbraco.Web.UI/Umbraco/js/install.loader.js @@ -1,4 +1,5 @@ -LazyLoad.js( [ +try { + LazyLoad.js([ 'lib/jquery/jquery.min.js', /* 1.1.5 */ 'lib/angular/1.1.5/angular.min.js', @@ -13,5 +14,11 @@ LazyLoad.js( [ jQuery(document).ready(function () { angular.bootstrap(document, ['ngSanitize', 'umbraco.install', 'umbraco.directives.validation']); }); + }); +} +catch (err) { + if (err.message == 'LazyLoad is not defined') { + document.getElementById("feedback").style.display = "none"; + document.getElementById("missinglazyload").style.display = "block"; } -); \ No newline at end of file +} \ No newline at end of file diff --git a/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml b/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml index 8171aad9e2..f0cb808264 100644 --- a/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml +++ b/src/Umbraco.Web.UI/umbraco/Install/Views/Index.cshtml @@ -45,7 +45,20 @@

-

{{installer.feedback}}

+

{{installer.feedback}}

+ + +