From dea9162642f2e5a0840e3cb1bbd3d10b061fa6d6 Mon Sep 17 00:00:00 2001 From: Kathy Lussier Date: Thu, 3 Nov 2016 14:03:10 -0400 Subject: [PATCH] LP#1642086: Make jQuery available for both OPAC and staff use First pass at moving files into common directory so that jQuery can be used in the OPAC in addition to the web client. Signed-off-by: Kathy Lussier Signed-off-by: Josh Stompro Conflicts: Open-ILS/src/templates/staff/base_js.tt2 Open-ILS/web/js/ui/default/common/Gruntfile.js Open-ILS/web/js/ui/default/common/bower.json Open-ILS/web/js/ui/default/staff/test/karma.conf.js --- Open-ILS/src/templates/staff/base_js.tt2 | 32 ++++++++--------- Open-ILS/src/templates/staff/config.tt2 | 2 +- .../js/ui/default/{staff => common}/Gruntfile.js | 42 +++++++++++----------- .../js/ui/default/{staff => common}/package.json | 0 .../web/js/ui/default/staff/test/karma.conf.js | 18 +++++----- 5 files changed, 47 insertions(+), 47 deletions(-) rename Open-ILS/web/js/ui/default/{staff => common}/Gruntfile.js (89%) rename Open-ILS/web/js/ui/default/{staff => common}/package.json (100%) diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2 index 82b662e432..2c865c3481 100644 --- a/Open-ILS/src/templates/staff/base_js.tt2 +++ b/Open-ILS/src/templates/staff/base_js.tt2 @@ -4,21 +4,21 @@ [% IF EXPAND_WEB_IMPORTS %] - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + @@ -49,7 +49,7 @@ [% ELSE %] - + [% END %] diff --git a/Open-ILS/src/templates/staff/config.tt2 b/Open-ILS/src/templates/staff/config.tt2 index c563d7ab97..a8366a8e2d 100644 --- a/Open-ILS/src/templates/staff/config.tt2 +++ b/Open-ILS/src/templates/staff/config.tt2 @@ -8,6 +8,6 @@ EVERGREEN_VERSION='0.0.1' EXPAND_WEB_IMPORTS = 1; # path to build files (js, css, fonts) -WEB_BUILD_PATH = ctx.media_prefix _ '/js/ui/default/staff/build/'; +WEB_BUILD_PATH = ctx.media_prefix _ '/js/ui/default/common/build/'; %] diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/common/Gruntfile.js similarity index 89% rename from Open-ILS/web/js/ui/default/staff/Gruntfile.js rename to Open-ILS/web/js/ui/default/common/Gruntfile.js index e5941960fa..d19c60d938 100644 --- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js +++ b/Open-ILS/web/js/ui/default/common/Gruntfile.js @@ -150,24 +150,24 @@ module.exports = function(grunt) { '/openils/lib/javascript/JSON_v1.js', '/openils/lib/javascript/opensrf.js', '/openils/lib/javascript/opensrf_ws.js', - 'services/core.js', - 'services/strings.js', - 'services/idl.js', - 'services/event.js', - 'services/net.js', - 'services/auth.js', - 'services/pcrud.js', - 'services/env.js', - 'services/org.js', - 'services/startup.js', - 'services/hatch.js', - 'services/print.js', - 'services/audio.js', - 'services/coresvc.js', - 'services/navbar.js', - 'services/ui.js', - 'services/date.js', - 'services/op_change.js', + '../staff/services/core.js', + '../staff/services/strings.js', + '../staff/services/idl.js', + '../staff/services/event.js', + '../staff/services/net.js', + '../staff/services/auth.js', + '../staff/services/pcrud.js', + '../staff/services/env.js', + '../staff/services/org.js', + '../staff/services/startup.js', + '../staff/services/hatch.js', + '../staff/services/print.js', + '../staff/services/audio.js', + '../staff/services/coresvc.js', + '../staff/services/navbar.js', + '../staff/services/ui.js', + '../staff/services/date.js', + '../staff/services/op_change.js', ], dest: 'build/js/<%= pkg.name %>.<%= pkg.version %>.min.js' }, @@ -186,19 +186,19 @@ module.exports = function(grunt) { // Generate test/data/IDL2js.js for unit tests. // note: the output of this script is *not* part of the final build. idl2js : { - command : 'cd test/data && perl idl2js.pl', + command : 'cd ../staff/test/data && perl idl2js.pl', }, // Remove the unit test IDL2js.js file. We don't need it after testing rmidl2js : { - command : 'rm test/data/IDL2js.js', + command : 'rm ../staff/test/data/IDL2js.js', } }, // unit tests configuration karma : { unit: { - configFile: 'test/karma.conf.js', + configFile: '../staff/test/karma.conf.js', //background: true // for now, visually babysit unit tests } } diff --git a/Open-ILS/web/js/ui/default/staff/package.json b/Open-ILS/web/js/ui/default/common/package.json similarity index 100% rename from Open-ILS/web/js/ui/default/staff/package.json rename to Open-ILS/web/js/ui/default/common/package.json 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 87d673130d..fc667e2a47 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,15 +6,15 @@ module.exports = function(config){ logLevel: config.LOG_INFO, files : [ - 'build/js/angular.min.js', - 'build/js/angular-route.min.js', - 'node_modules/angular-mocks/angular-mocks.js', // testing only - 'node_modules/angular-file-saver/dist/angular-file-saver.bundle.min.js', - 'node_modules/ng-toast/dist/ngToast.min.js', - 'node_modules/angular-sanitize/angular-sanitize.min.js', - 'build/js/ui-bootstrap.js', - 'build/js/hotkeys.min.js', - 'build/js/angular-cookies.min.js', + '../common/build/js/angular.min.js', + '../common/build/js/angular-route.min.js', + '../common/bower_components/angular-mocks/angular-mocks.js', // testing only + '../common/bower_components/angular-file-saver/dist/angular-file-saver.bundle.min.js', + '../common/bower_components/ngtoast/dist/ngToast.min.js', + '../common/bower_components/angular-sanitize/angular-sanitize.min.js', + '../common/build/js/ui-bootstrap.min.js', + '../common/build/js/hotkeys.min.js', + '../common/build/js/angular-cookies.min.js', /* OpenSRF must be installed first */ '/openils/lib/javascript/md5.js', '/openils/lib/javascript/JSON_v1.js', -- 2.11.0