From: Bill Erickson Date: Wed, 30 Aug 2017 15:53:40 +0000 (-0400) Subject: LP#1642086 TPAC Jquery path repair, .gitignore, karma X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=092f3e98134b70e02ccdd5eb472ec14e58d3c32c;p=working%2FEvergreen.git LP#1642086 TPAC Jquery path repair, .gitignore, karma * Repair JS path in TPAC jquery import. * Tell git to ignore Open-ILS/web/js/ui/default/common/build/ since it only contains generated files. * Add jquery to Karma unit test dependencies. This is not strictly required, since angular includes a slim jquery shim, but having the unit tests load the same base JS as the UI is probably best. Confirmed tests still pass. Signed-off-by: Bill Erickson Signed-off-by: Mike Rylander --- diff --git a/.gitignore b/.gitignore index fd8a391f4d..df70dea6e8 100644 --- a/.gitignore +++ b/.gitignore @@ -361,4 +361,5 @@ Open-ILS/web/js/ui/default/staff/node_modules/ Open-ILS/web/js/ui/default/staff/bower_components/ Open-ILS/web/js/ui/default/common/build/ KCLS/test-scripts/sip/pysip2-client.ini +Open-ILS/web/js/ui/default/common/build/ Open-ILS/web/eg2/