From: Bill Erickson Date: Thu, 2 Apr 2015 16:20:33 +0000 (-0400) Subject: LP#1350350 Add jquery browser client dependency X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=refs%2Fheads%2Fuser%2Fberick%2Flp1350350-browser-client-jquery-dep;p=working%2FEvergreen.git LP#1350350 Add jquery browser client dependency Tell bower to install jquery when fetching and building the browser client dependencies. Tell grunt to copy the jquery files into the build directory. Signed-off-by: Bill Erickson --- diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js index a3ba032631..c33010f501 100644 --- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js +++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js @@ -22,6 +22,8 @@ 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', + 'bower_components/jquery/dist/jquery.min.map' ] }] }, diff --git a/Open-ILS/web/js/ui/default/staff/bower.json b/Open-ILS/web/js/ui/default/staff/bower.json index 8c2ed1f4e6..65892f56ca 100644 --- a/Open-ILS/web/js/ui/default/staff/bower.json +++ b/Open-ILS/web/js/ui/default/staff/bower.json @@ -18,6 +18,7 @@ "tests" ], "devDependencies": { + "jquery" : "~2.1.3", "bootstrap": "~3.1.1", "angular": "~1.2.16", "angular-route": "~1.2.16",