webstaff: install and include Lovefield in prep for offline mode

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Conflicts:
	Open-ILS/web/js/ui/default/staff/Gruntfile.js
	Open-ILS/web/js/ui/default/staff/bower.json

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index 1054c05..06f8bc4 100644 (file)
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -18,6 +18,7 @@
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-tree-control.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/iframeResizer.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ng-order-object-by.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/lovefield.min.js"></script>
 
 <!-- IDL / opensrf (network) -->
 <script src="[% ctx.media_prefix %]/js/dojo/opensrf/JSON_v1.js"></script>

diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
index 2b93c14..b35584a 100644 (file)
--- 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) {
             'node_modules/iframe-resizer/js/iframeResizer.min.js',
             'node_modules/iframe-resizer/js/iframeResizer.map',
             'node_modules/iframe-resizer/js/iframeResizer.contentWindow.min.js',
-            'node_modules/angular-order-object-by/src/ng-order-object-by.js'
+            'node_modules/angular-order-object-by/src/ng-order-object-by.js',
+            'node_modules/lovefield/dist/lovefield.min.js',
+            'node_modules/lovefield/dist/lovefield.min.js.map'
           ]
         }]
       },
@@ -142,7 +144,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/package.json b/Open-ILS/web/js/ui/default/staff/package.json
index 91a1802..91c88fa 100644 (file)
--- a/Open-ILS/web/js/ui/default/staff/package.json
+++ b/Open-ILS/web/js/ui/default/staff/package.json
@@ -16,6 +16,7 @@
     "angular-route": "~1.5.0",
     "angular-tree-control": "~0.2.28",
     "angular-order-object-by": "rxfork/ngOrderObjectBy#npm",
+    "lovefield": "*",
     "bootstrap": "~3.3.6",
     "grunt": "~0.4.4",
     "grunt-cli": "^0.1.13",