From 05a95958d49e6b9fdbd2d817e8261d9e1a57bb58 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Wed, 30 Mar 2016 17:24:32 -0400 Subject: [PATCH] LP#1570091: webstaff: fix deps for ngToast, and put it in place gloablly Signed-off-by: Mike Rylander Signed-off-by: Galen Charlton Signed-off-by: Bill Erickson --- Open-ILS/src/templates/staff/base.tt2 | 1 + Open-ILS/src/templates/staff/base_js.tt2 | 2 ++ Open-ILS/web/js/ui/default/staff/Gruntfile.js | 6 ++++++ Open-ILS/web/js/ui/default/staff/bower.json | 3 ++- 4 files changed, 11 insertions(+), 1 deletion(-) diff --git a/Open-ILS/src/templates/staff/base.tt2 b/Open-ILS/src/templates/staff/base.tt2 index 1e2c740e92..7f4c64a958 100644 --- a/Open-ILS/src/templates/staff/base.tt2 +++ b/Open-ILS/src/templates/staff/base.tt2 @@ -23,6 +23,7 @@ + + + diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js index 796c616112..0ba1afed63 100644 --- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js +++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js @@ -17,6 +17,10 @@ module.exports = function(grunt) { src: [ 'bower_components/angular/angular.min.js', 'bower_components/angular/angular.min.js.map', + 'bower_components/angular-animate/angular-animate.min.js', + 'bower_components/angular-animate/angular-animate.min.js.map', + 'bower_components/angular-sanitize/angular-sanitize.min.js', + 'bower_components/angular-sanitize/angular-sanitize.min.js.map', 'bower_components/angular-route/angular-route.min.js', 'bower_components/angular-route/angular-route.min.js.map', 'bower_components/angular-bootstrap/ui-bootstrap.min.js', @@ -92,6 +96,8 @@ module.exports = function(grunt) { // The order is important. 'build/js/jquery.min.js', 'build/js/angular.min.js', + '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', diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json index 0e9414ee8c..052978c31a 100644 --- a/Open-ILS/web/js/ui/default/staff/bower.json +++ b/Open-ILS/web/js/ui/default/staff/bower.json @@ -30,6 +30,7 @@ "angular-location-update": "./extern/angular-location-update/", "angular-file-saver": "~1.0.2", "ngtoast": "~2.0.0", - "angular-tree-control": "~0.2.23" + "angular-tree-control": "~0.2.23", + "angular-animate": "~1.5.3" } } -- 2.43.2