[open-ils-commits] [GIT] Evergreen ILS branch master updated. 74e1fba0f5f6a0fd61db86216107b57a36f209a5
Evergreen Git
git at git.evergreen-ils.org
Wed Aug 30 16:56:45 EDT 2017
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via 74e1fba0f5f6a0fd61db86216107b57a36f209a5 (commit)
via 5120189a1b973495608131634fab376daa075dff (commit)
via 92dce936ac9dec063c52c1878ef647a284110312 (commit)
from f1e2631e2cf586d906cf9fe0f971274045b8d243 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 74e1fba0f5f6a0fd61db86216107b57a36f209a5
Author: Mike Rylander <mrylander at gmail.com>
Date: Wed Aug 30 16:54:59 2017 -0400
LP#1642086: Adjust offline resources for jquery support
Offline needs to know about all the resources and their correct locations.
Since we're moving jquery.min.js, tell it about that.
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index db4de84..2474245 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -20,7 +20,7 @@ UpUp.start({
'[% ctx.media_prefix %]/js/dojo/opensrf/md5.js',
'[% ctx.media_prefix %]/js/ui/default/staff/build/js/moment-with-locales.min.js',
'[% ctx.media_prefix %]/js/ui/default/staff/build/js/moment-timezone-with-data.min.js',
- '[% ctx.media_prefix %]/js/ui/default/staff/build/js/jquery.min.js',
+ '[% ctx.media_prefix %]/js/ui/default/common/build/js/jquery.min.js',
'[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular.min.js',
'[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-route.min.js',
'[% ctx.media_prefix %]/js/ui/default/staff/build/js/ui-bootstrap-tpls.min.js',
commit 5120189a1b973495608131634fab376daa075dff
Author: Bill Erickson <berickxx at gmail.com>
Date: Wed Aug 30 11:53:40 2017 -0400
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 <berickxx at gmail.com>
Signed-off-by: Mike Rylander <mrylander at gmail.com>
diff --git a/.gitignore b/.gitignore
index 39fb328..62dea57 100644
--- a/.gitignore
+++ b/.gitignore
@@ -359,3 +359,4 @@ 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/
+Open-ILS/web/js/ui/default/common/build/
diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index df0d4cc..79db0ed 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 1150a07..0b30d4a 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',
commit 92dce936ac9dec063c52c1878ef647a284110312
Author: Mike Rylander <mrylander at gmail.com>
Date: Tue Aug 15 12:51:16 2017 -0400
LP#1642086: Smallest possible JQuery patch that could work...
Signed-off-by: Mike Rylander <mrylander at gmail.com>
Signed-off-by: Bill Erickson <berickxx at gmail.com>
diff --git a/Open-ILS/src/templates/opac/parts/config.tt2 b/Open-ILS/src/templates/opac/parts/config.tt2
index aff6d6e..28f730c 100644
--- a/Open-ILS/src/templates/opac/parts/config.tt2
+++ b/Open-ILS/src/templates/opac/parts/config.tt2
@@ -237,6 +237,13 @@ ctx.exclude_electronic_checkbox = 0;
##############################################################################
# obalkyknih_cz.enabled = 'false';
+##############################################################################
+# JQuery support
+##############################################################################
+# Include JQuery in the TPAC?
+# Set to a true value to enable
+##############################################################################
+# ctx.want_jquery = 1;
##############################################################################
# Browser cache-busting key
diff --git a/Open-ILS/src/templates/opac/parts/js.tt2 b/Open-ILS/src/templates/opac/parts/js.tt2
index d4c588f..df0d4cc 100644
--- a/Open-ILS/src/templates/opac/parts/js.tt2
+++ b/Open-ILS/src/templates/opac/parts/js.tt2
@@ -1,6 +1,11 @@
<!-- JS imports, etc. -->
<script type="text/javascript" src="[% ctx.media_prefix %]/js/ui/default/opac/simple.js[% ctx.cache_key %]"></script>
[% 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>
+[% END; # ctx.want_jquery %]
+
<!-- DOB validation for Patron Registration in OPAC -->
<script type="text/javascript">
function dobValidate(input) {
diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2
index 7563869..db4de84 100644
--- a/Open-ILS/src/templates/staff/base_js.tt2
+++ b/Open-ILS/src/templates/staff/base_js.tt2
@@ -82,7 +82,7 @@ UpUp.start({
[% IF EXPAND_WEB_IMPORTS %]
<!-- angular -->
-<script src="[% ctx.media_prefix %]/js/ui/default/staff/build/js/jquery.min.js"></script>
+<script src="[% ctx.media_prefix %]/js/ui/default/common/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 978e918..d8a05e1 100644
--- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js
+++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js
@@ -30,7 +30,6 @@ module.exports = function(grunt) {
'node_modules/angular-location-update/angular-location-update.min.js',
'node_modules/angular-tree-control/angular-tree-control.js',
'node_modules/ng-toast/dist/ngToast.min.js',
- 'node_modules/jquery/dist/jquery.min.js',
'node_modules/angular-cookies/angular-cookies.min.js',
'node_modules/angular-cookies/angular-cookies.min.js.map',
'node_modules/iframe-resizer/js/iframeResizer.min.js',
@@ -43,6 +42,15 @@ module.exports = function(grunt) {
'node_modules/moment/min/moment-with-locales.min.js',
'node_modules/moment-timezone/builds/moment-timezone-with-data.min.js'
]
+ },
+ {
+ dest: '../common/build/js/',
+ flatten: true,
+ filter: 'isFile',
+ expand : true,
+ src: [
+ 'node_modules/jquery/dist/jquery.min.js'
+ ]
}]
},
@@ -139,7 +147,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',
+ '../common/build/js/jquery.min.js',
'build/js/angular.min.js',
'build/js/angular-animate.min.js',
'build/js/angular-sanitize.min.js',
-----------------------------------------------------------------------
Summary of changes:
.gitignore | 1 +
Open-ILS/src/templates/opac/parts/config.tt2 | 7 +++++++
Open-ILS/src/templates/opac/parts/js.tt2 | 5 +++++
Open-ILS/src/templates/staff/base_js.tt2 | 4 ++--
Open-ILS/web/js/ui/default/staff/Gruntfile.js | 12 ++++++++++--
.../web/js/ui/default/staff/test/karma.conf.js | 1 +
6 files changed, 26 insertions(+), 4 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list