From: Mike Rylander <mrylander@gmail.com>
Date: Fri, 27 Feb 2015 17:13:52 +0000 (-0500)
Subject: webstaff: internalize jquery
X-Git-Tag: sprint4-merge-nov22~1191
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=73e341b3f2e8404cf9ebe4520b4689e0a394dfd7;p=working%2FEvergreen.git

webstaff: internalize jquery

Signed-off-by: Mike Rylander <mrylander@gmail.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index 8947ca3e8c..5e60ee0df3 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -3,7 +3,7 @@
 [% IF EXPAND_WEB_IMPORTS %]
 
 <!-- angular -->
-<script src="https://code.jquery.com/jquery-2.1.3.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/jquery.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-route.min.js"></script>
 <script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/ui-bootstrap-tpls.min.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 a3ba032631..8dcd3c1715 100644
--- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js
+++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
@@ -22,6 +22,7 @@ module.exports = function(grunt) {
             'bower_components/angular-bootstrap/ui-bootstrap.min.js',
             'bower_components/angular-bootstrap/ui-bootstrap-tpls.min.js',
             'bower_components/angular-hotkeys/build/hotkeys.min.js',
+            'bower_components/jquery/dist/jquery.min.js',
           ]
         }]
       },
@@ -77,6 +78,7 @@ module.exports = function(grunt) {
         src: [
             // These are concatenated in order in the final build file.
             // The order is important.
+            'build/js/jquery.min.js',
             'build/js/angular.min.js',
             'build/js/angular-route.min.js',
             'build/js/ui-bootstrap.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 8c2ed1f4e6..dc441267a9 100644
--- a/Open-ILS/web/js/ui/default/staff/bower.json
+++ b/Open-ILS/web/js/ui/default/staff/bower.json
@@ -19,6 +19,7 @@
   ],
   "devDependencies": {
     "bootstrap": "~3.1.1",
+    "jquery": "~2.1.3",
     "angular": "~1.2.16",
     "angular-route": "~1.2.16",
     "angular-mocks": "~1.2.16",