From 9d1f7d2980b1a4ce02191a4ef183175aded57a52 Mon Sep 17 00:00:00 2001
From: Bill Erickson <berickxx@gmail.com>
Date: Wed, 30 Aug 2017 11:53:40 -0400
Subject: [PATCH] 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/ for now 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 <berickxx@gmail.com>
---
 .gitignore                                          | 2 ++
 Open-ILS/src/templates/opac/parts/js.tt2            | 2 +-
 Open-ILS/web/js/ui/default/staff/test/karma.conf.js | 1 +
 3 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 39fb328c59..7914b4975e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -359,3 +359,5 @@ Thumbs.db
 Open-ILS/web/js/ui/default/staff/build/
 Open-ILS/web/js/ui/default/staff/node_modules/
 Open-ILS/web/js/ui/default/staff/bower_components/
+# LP#1642086 Remove me if/when tracked files are added to /common/
+Open-ILS/web/js/ui/default/common/
diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index df0d4cc910..79db0edef7 100644
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -3,7 +3,7 @@
 [% INCLUDE "opac/i18n_strings.tt2" %]
 
 [% IF ctx.want_jquery %]
-<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/common/jquery.min.js[% ctx.cache_key %]"></script>
+<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/common/build/js/jquery.min.js[% ctx.cache_key %]"></script>
 [% END; # ctx.want_jquery %]
 
 <!-- DOB validation for Patron Registration in OPAC -->
diff --git a/Open-ILS/web/js/ui/default/staff/test/karma.conf.js b/Open-ILS/web/js/ui/default/staff/test/karma.conf.js
index 1150a072db..0b30d4ad8c 100644
--- a/Open-ILS/web/js/ui/default/staff/test/karma.conf.js
+++ b/Open-ILS/web/js/ui/default/staff/test/karma.conf.js
@@ -6,6 +6,7 @@ module.exports = function(config){
     logLevel: config.LOG_INFO,
 
     files : [
+      '../common/build/js/jquery.min.js',
       'build/js/lovefield.min.js',
       'build/js/angular.min.js',
       'build/js/angular-route.min.js',
-- 
2.11.0