From c8ade404367d7fa76089640b5e3c1425f4f47363 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 --- Open-ILS/src/templates/staff/base_js.tt2 | 28 +++++++-------- Open-ILS/src/templates/staff/config.tt2 | 2 +- .../js/ui/default/{staff => common}/Gruntfile.js | 42 +++++++++++----------- .../web/js/ui/default/{staff => common}/bower.json | 0 .../js/ui/default/{staff => common}/package.json | 0 .../web/js/ui/default/staff/test/karma.conf.js | 18 +++++----- 6 files changed, 45 insertions(+), 45 deletions(-) rename Open-ILS/web/js/ui/default/{staff => common}/Gruntfile.js (88%) rename Open-ILS/web/js/ui/default/{staff => common}/bower.json (100%) 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 fac97115e7..726709e4d2 100644 --- a/Open-ILS/src/templates/staff/base_js.tt2 +++ b/Open-ILS/src/templates/staff/base_js.tt2 @@ -4,19 +4,19 @@ [% IF EXPAND_WEB_IMPORTS %] - - - - - - - - - - - - - + + + + + + + + + + + + + @@ -47,7 +47,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 88% rename from Open-ILS/web/js/ui/default/staff/Gruntfile.js rename to Open-ILS/web/js/ui/default/common/Gruntfile.js index 2d982c41ef..36bcf669a8 100644 --- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js +++ b/Open-ILS/web/js/ui/default/common/Gruntfile.js @@ -134,24 +134,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/statusbar.js', - 'services/ui.js', - 'services/date.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/statusbar.js', + '../staff/services/ui.js', + '../staff/services/date.js', ], dest: 'build/js/<%= pkg.name %>.<%= pkg.version %>.min.js' } @@ -170,19 +170,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/bower.json b/Open-ILS/web/js/ui/default/common/bower.json similarity index 100% rename from Open-ILS/web/js/ui/default/staff/bower.json rename to Open-ILS/web/js/ui/default/common/bower.json 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 b0cef3fb7b..5b11d47978 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', - 'bower_components/angular-mocks/angular-mocks.js', // testing only - 'bower_components/angular-file-saver/dist/angular-file-saver.bundle.min.js', - 'bower_components/ngtoast/dist/ngToast.min.js', - 'bower_components/angular-sanitize/angular-sanitize.min.js', - 'build/js/ui-bootstrap.min.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