[open-ils-commits] [GIT] Evergreen ILS branch master updated. 1935f39c1d21c24e1abdc92119319b17e4d153a9

[Evergreen Git]

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  1935f39c1d21c24e1abdc92119319b17e4d153a9 (commit)
       via  5cc3ce7a9e5f1b503edf439a7c3316ba4c053bbd (commit)
      from  8e7e84fe5dac4ef4fdc5434f63b9f3c289287c1f (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 1935f39c1d21c24e1abdc92119319b17e4d153a9
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date:   Fri Mar 2 17:13:52 2018 -0500

    LP#1751520: add specify path to content-menu.js explicitly
    
    Otherwise, Webpack looks for a /module/ called context-menu, and
    doesn't find it.
    
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/web/js/ui/default/staff/webpack.config.js b/Open-ILS/web/js/ui/default/staff/webpack.config.js
index f70c42b..3aa54ed 100644
--- a/Open-ILS/web/js/ui/default/staff/webpack.config.js
+++ b/Open-ILS/web/js/ui/default/staff/webpack.config.js
@@ -97,8 +97,8 @@ const vendorJsFiles = [
   'angular-sanitize',
   'angular-cookies',
   'ng-toast',
-  'context-menu',
   'angular-tree-control',
+  'angular-tree-control/context-menu.js',
   'iframe-resizer',
   'angular-order-object-by',
   'lovefield',

commit 5cc3ce7a9e5f1b503edf439a7c3316ba4c053bbd
Author: Jason Boyer <jboyer at library.in.gov>
Date:   Tue Feb 27 09:08:21 2018 -0500

    LP1751520: Add contextMenu Module to Vendor Bundle
    
    This patch adds the context-menu.js file to the vendor
    bundle for use by angular-tree-control.js
    
    This branch is for master/rel_3_1; not rel_3_0
    
    Signed-off-by: Jason Boyer <jboyer at library.in.gov>
    Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
    Signed-off-by: Dan Wells <dbw2 at calvin.edu>

diff --git a/Open-ILS/web/js/ui/default/staff/webpack.config.js b/Open-ILS/web/js/ui/default/staff/webpack.config.js
index d8509ea..f70c42b 100644
--- a/Open-ILS/web/js/ui/default/staff/webpack.config.js
+++ b/Open-ILS/web/js/ui/default/staff/webpack.config.js
@@ -97,6 +97,7 @@ const vendorJsFiles = [
   'angular-sanitize',
   'angular-cookies',
   'ng-toast',
+  'context-menu',
   'angular-tree-control',
   'iframe-resizer',
   'angular-order-object-by',

-----------------------------------------------------------------------

Summary of changes:
 Open-ILS/web/js/ui/default/staff/webpack.config.js |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
Evergreen ILS