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

Fixes: U4-6947 Don't ship unnecessary js files

Browse Source
This commit is contained in:
Shannon
2015-08-31 18:51:36 +02:00
parent 23a7e515f8
commit b883c7cb11
3 changed files with 57 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/Umbraco.Web.UI.Client/gruntFile.js
View File

@@ -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: {

2
src/Umbraco.Web.UI.Client/src/index.html
View File

@@ -23,6 +23,6 @@
<script src="lib/rgrove-lazyload/lazyload.js"></script>
<script src="js/loader.js"></script>
<script src="js/loader.dev.js"></script>
</body>
</html>

100
src/Umbraco.Web.UI.Client/src/loader.js → src/Umbraco.Web.UI.Client/src/loader.dev.js
View File

@@ -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']);
});
}
);