From 562bab728dcefc70b642b018b7a99c8b50fd7108 Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Thu, 6 Apr 2017 16:28:31 -0400 Subject: [PATCH] angular-ui-bootstrap stopped shipping minified files Per https://github.com/angular-ui/bootstrap/issues/5522 upstream feels users should minimize the files themselves. Signed-off-by: Dan Scott --- Open-ILS/web/js/ui/default/staff/Gruntfile.js | 24 ++++++++++++++++------ .../web/js/ui/default/staff/test/karma.conf.js | 2 +- 2 files changed, 19 insertions(+), 7 deletions(-) diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js index d006a65f47..430f646044 100644 --- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js +++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js @@ -23,8 +23,8 @@ module.exports = function(grunt) { 'node_modules/angular-sanitize/angular-sanitize.min.js.map', 'node_modules/angular-route/angular-route.min.js', 'node_modules/angular-route/angular-route.min.js.map', - 'node_modules/angular-ui-bootstrap/dist/ui-bootstrap.min.js', - 'node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.min.js', + 'node_modules/angular-ui-bootstrap/dist/ui-bootstrap.js', + 'node_modules/angular-ui-bootstrap/dist/ui-bootstrap-tpls.js', 'node_modules/angular-hotkeys/build/hotkeys.min.js', 'node_modules/angular-file-saver/dist/angular-file-saver.bundle.min.js', 'node_modules/angular-location-update/angular-location-update.min.js', @@ -68,7 +68,8 @@ module.exports = function(grunt) { 'node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.eot', 'node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.svg', 'node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.ttf', - 'node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff' + 'node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff', + 'node_modules/bootstrap/dist/fonts/glyphicons-halflings-regular.woff2' ] }] }, @@ -126,8 +127,8 @@ module.exports = function(grunt) { 'build/js/angular-animate.min.js', 'build/js/angular-sanitize.min.js', 'build/js/angular-route.min.js', - 'build/js/ui-bootstrap.min.js', - 'build/js/ui-bootstrap-tpls.min.js', + 'build/js/ui-bootstrap.js', + 'build/js/ui-bootstrap-tpls.js', 'build/js/hotkeys.min.js', 'build/js/angular-tree-control.js', 'build/js/ngToast.min.js', @@ -157,6 +158,17 @@ module.exports = function(grunt) { ], dest: 'build/js/<%= pkg.name %>.<%= pkg.version %>.min.js' } + dev: { + files: [{ + expand: true, + src: ['build/js/ui-bootstrap.js', 'build/js/ui-bootstrap-tpls.js'], + dest: 'build/js', + cwd: '.', + rename: function (dst, src) { + return dst + '/' + src.replace('.js', '.min.js'); + } + }], + }, }, // bare concat operation; useful for testing concat w/o minification @@ -204,7 +216,7 @@ module.exports = function(grunt) { grunt.loadNpmTasks('grunt-karma'); grunt.loadNpmTasks('grunt-exec'); - // note: "grunt concat" is not requried + // note: "grunt concat" is not required grunt.registerTask('build', ['copy', 'cssmin', 'uglify']); // test only, no minification diff --git a/Open-ILS/web/js/ui/default/staff/test/karma.conf.js b/Open-ILS/web/js/ui/default/staff/test/karma.conf.js index 0170e3c439..4da4e66f30 100644 --- a/Open-ILS/web/js/ui/default/staff/test/karma.conf.js +++ b/Open-ILS/web/js/ui/default/staff/test/karma.conf.js @@ -12,7 +12,7 @@ module.exports = function(config){ 'node_modules/angular-file-saver/dist/angular-file-saver.bundle.min.js', 'node_modules/ng-toast/dist/ngToast.min.js', 'node_modules/angular-sanitize/angular-sanitize.min.js', - 'build/js/ui-bootstrap.min.js', + 'build/js/ui-bootstrap.js', 'build/js/hotkeys.min.js', 'build/js/angular-cookies.min.js', /* OpenSRF must be installed first */ -- 2.11.0