From 27d8e37ebc10c8b7c48e237c191b9942c44f8de4 Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Thu, 30 Mar 2017 14:15:34 -0400 Subject: [PATCH] webstaff: install and include Lovefield in prep for offline mode Signed-off-by: Mike Rylander --- Open-ILS/src/templates/staff/base_js.tt2 | 1 + Open-ILS/web/js/ui/default/staff/Gruntfile.js | 6 +++++- Open-ILS/web/js/ui/default/staff/bower.json | 5 +++-- 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2 index 224ae0f137..7ea0d86dba 100644 --- a/Open-ILS/src/templates/staff/base_js.tt2 +++ b/Open-ILS/src/templates/staff/base_js.tt2 @@ -18,6 +18,7 @@ + diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js index 7015786bc7..aaa451ea39 100644 --- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js +++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js @@ -36,7 +36,9 @@ module.exports = function(grunt) { 'bower_components/iframe-resizer/js/iframeResizer.min.js', 'bower_components/iframe-resizer/js/iframeResizer.map', 'bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js', - 'bower_components/angular-order-object-by/src/ng-order-object-by.js' + 'bower_components/angular-order-object-by/src/ng-order-object-by.js', + 'bower_components/lovefield/dist/lovefield.min.js', + 'bower_components/lovefield/dist/lovefield.min.js.map' ] }] }, @@ -131,7 +133,9 @@ module.exports = function(grunt) { 'build/js/hotkeys.min.js', 'build/js/angular-tree-control.js', 'build/js/ngToast.min.js', + 'build/js/lovefield.min.js', // NOTE: OpenSRF must be installed + // XXX: Should not be hard-coded '/openils/lib/javascript/JSON_v1.js', '/openils/lib/javascript/opensrf.js', '/openils/lib/javascript/opensrf_ws.js', diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json index 65a8539a85..7bc109fde0 100644 --- a/Open-ILS/web/js/ui/default/staff/bower.json +++ b/Open-ILS/web/js/ui/default/staff/bower.json @@ -30,9 +30,10 @@ "angular-tree-control": "~0.2.28", "angular-animate": "~1.5.3", "angular-hotkeys": "cfp-angular-hotkeys#^1.7.0", - "angular-cookies": "^1.5.8", + "angular-cookies": "~1.5.8", "iframe-resizer": "^3.5.5", - "angular-order-object-by": "*" + "angular-order-object-by": "*", + "lovefield": "*" }, "resolutions": { "angular": "~1.5.5" -- 2.11.0