From b883c7cb1146fcddb715924696267c92c2a0686a Mon Sep 17 00:00:00 2001 From: Shannon Date: Mon, 31 Aug 2015 18:51:36 +0200 Subject: [PATCH] Fixes: U4-6947 Don't ship unnecessary js files --- src/Umbraco.Web.UI.Client/gruntFile.js | 9 +- src/Umbraco.Web.UI.Client/src/index.html | 2 +- .../src/{loader.js => loader.dev.js} | 100 +++++++++--------- 3 files changed, 57 insertions(+), 54 deletions(-) rename src/Umbraco.Web.UI.Client/src/{loader.js => loader.dev.js} (96%) diff --git a/src/Umbraco.Web.UI.Client/gruntFile.js b/src/Umbraco.Web.UI.Client/gruntFile.js index 9f77d700cb..8699f4a6f1 100644 --- a/src/Umbraco.Web.UI.Client/gruntFile.js +++ b/src/Umbraco.Web.UI.Client/gruntFile.js @@ -18,10 +18,10 @@ module.exports = function (grunt) { grunt.registerTask('watch-test', ['jshint:dev', 'karma:unit']); //triggered from grunt dev or grunt - grunt.registerTask('build', ['clean', 'concat', 'recess:min', 'recess:installer', 'recess:canvasdesigner', 'bower-install-simple', 'bower', 'copy']); + grunt.registerTask('build', ['clean:pre', 'concat', 'recess:min', 'recess:installer', 'recess:canvasdesigner', 'bower-install-simple', 'bower', 'copy', 'clean:post']); //build-dev doesn't min - we are trying to speed this up and we don't want minified stuff when we are in dev mode - grunt.registerTask('build-dev', ['clean', 'concat', 'recess:build', 'recess:installer', 'bower-install-simple', 'bower', 'copy']); + grunt.registerTask('build-dev', ['clean:pre', 'concat', 'recess:build', 'recess:installer', 'bower-install-simple', 'bower', 'copy']); //utillity tasks grunt.registerTask('docs', ['ngdocs']); @@ -108,7 +108,10 @@ module.exports = function (grunt) { prod: ['<%= distdir %>/js/*.js'] }, - clean: ['<%= distdir %>/*'], + clean: { + pre: ['<%= distdir %>/*'], + post: ['<%= distdir %>/js/*.dev.js'] + }, copy: { assets: { diff --git a/src/Umbraco.Web.UI.Client/src/index.html b/src/Umbraco.Web.UI.Client/src/index.html index a16987ce2c..362510e044 100644 --- a/src/Umbraco.Web.UI.Client/src/index.html +++ b/src/Umbraco.Web.UI.Client/src/index.html @@ -23,6 +23,6 @@ - + diff --git a/src/Umbraco.Web.UI.Client/src/loader.js b/src/Umbraco.Web.UI.Client/src/loader.dev.js similarity index 96% rename from src/Umbraco.Web.UI.Client/src/loader.js rename to src/Umbraco.Web.UI.Client/src/loader.dev.js index dda23dce0a..2be6593238 100644 --- a/src/Umbraco.Web.UI.Client/src/loader.js +++ b/src/Umbraco.Web.UI.Client/src/loader.dev.js @@ -1,51 +1,51 @@ -LazyLoad.js( - [ - 'lib/jquery/jquery.min.js', - 'lib/angular/1.1.5/angular.min.js', - 'lib/underscore/underscore-min.js', - - 'lib/jquery-ui/jquery-ui.min.js', - - 'lib/angular/1.1.5/angular-cookies.min.js', - 'lib/angular/1.1.5/angular-mobile.js', - 'lib/angular/1.1.5/angular-sanitize.min.js', - - 'lib/angular/angular-ui-sortable.js', - - 'lib/angular-dynamic-locale/tmhDynamicLocale.min.js', - - 'lib/blueimp-load-image/load-image.all.min.js', - 'lib/jquery-file-upload/jquery.fileupload.js', - 'lib/jquery-file-upload/jquery.fileupload-process.js', - 'lib/jquery-file-upload/jquery.fileupload-image.js', - 'lib/jquery-file-upload/jquery.fileupload-angular.js', - - 'lib/bootstrap/js/bootstrap.2.3.2.min.js', - 'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js', - 'lib/umbraco/Extensions.js', - - 'lib/umbraco/NamespaceManager.js', - 'lib/umbraco/LegacyUmbClientMgr.js', - 'lib/umbraco/LegacySpeechBubble.js', - - 'js/umbraco.servervariables.js', - 'js/app.dev.js', - 'js/umbraco.httpbackend.js', - 'js/umbraco.testing.js', - - 'js/umbraco.directives.js', - 'js/umbraco.filters.js', - 'js/umbraco.resources.js', - 'js/umbraco.services.js', - 'js/umbraco.security.js', - 'js/umbraco.controllers.js', - 'js/routes.js', - 'js/init.js' - ], - - function () { - jQuery(document).ready(function () { - angular.bootstrap(document, ['umbraco']); - }); - } +LazyLoad.js( + [ + 'lib/jquery/jquery.min.js', + 'lib/angular/1.1.5/angular.min.js', + 'lib/underscore/underscore-min.js', + + 'lib/jquery-ui/jquery-ui.min.js', + + 'lib/angular/1.1.5/angular-cookies.min.js', + 'lib/angular/1.1.5/angular-mobile.js', + 'lib/angular/1.1.5/angular-sanitize.min.js', + + 'lib/angular/angular-ui-sortable.js', + + 'lib/angular-dynamic-locale/tmhDynamicLocale.min.js', + + 'lib/blueimp-load-image/load-image.all.min.js', + 'lib/jquery-file-upload/jquery.fileupload.js', + 'lib/jquery-file-upload/jquery.fileupload-process.js', + 'lib/jquery-file-upload/jquery.fileupload-image.js', + 'lib/jquery-file-upload/jquery.fileupload-angular.js', + + 'lib/bootstrap/js/bootstrap.2.3.2.min.js', + 'lib/bootstrap-tabdrop/bootstrap-tabdrop.min.js', + 'lib/umbraco/Extensions.js', + + 'lib/umbraco/NamespaceManager.js', + 'lib/umbraco/LegacyUmbClientMgr.js', + 'lib/umbraco/LegacySpeechBubble.js', + + 'js/umbraco.servervariables.js', + 'js/app.dev.js', + 'js/umbraco.httpbackend.js', + 'js/umbraco.testing.js', + + 'js/umbraco.directives.js', + 'js/umbraco.filters.js', + 'js/umbraco.resources.js', + 'js/umbraco.services.js', + 'js/umbraco.security.js', + 'js/umbraco.controllers.js', + 'js/routes.js', + 'js/init.js' + ], + + function () { + jQuery(document).ready(function () { + angular.bootstrap(document, ['umbraco']); + }); + } ); \ No newline at end of file