From 5c07f11bcb78426734f3fdaf6c42c0fc6059b970 Mon Sep 17 00:00:00 2001 From: Jason Boyer Date: Tue, 27 Feb 2018 08:58:12 -0500 Subject: [PATCH] LP1751520: Add contextMenu Module to JS Include the missing context-menu.js file to allow the angularTreeControl module to function properly. This branch is specific to rel_3_0 using Grunt. Signed-off-by: Jason Boyer Signed-off-by: Galen Charlton --- Open-ILS/src/templates/staff/base_js.tt2 | 2 ++ Open-ILS/web/js/ui/default/staff/Gruntfile.js | 2 ++ 2 files changed, 4 insertions(+) diff --git a/Open-ILS/src/templates/staff/base_js.tt2 b/Open-ILS/src/templates/staff/base_js.tt2 index 2932e453f8..bc0a1754e5 100644 --- a/Open-ILS/src/templates/staff/base_js.tt2 +++ b/Open-ILS/src/templates/staff/base_js.tt2 @@ -44,6 +44,7 @@ UpUp.start({ '[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-sanitize.min.js', '[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-cookies.min.js', '[% ctx.media_prefix %]/js/ui/default/staff/build/js/ngToast.min.js', + '[% ctx.media_prefix %]/js/ui/default/staff/build/js/context-menu.js', '[% ctx.media_prefix %]/js/ui/default/staff/build/js/angular-tree-control.js', '[% ctx.media_prefix %]/js/ui/default/staff/build/js/iframeResizer.min.js', '[% ctx.media_prefix %]/js/ui/default/staff/build/js/ng-order-object-by.js', @@ -107,6 +108,7 @@ UpUp.start({ + diff --git a/Open-ILS/web/js/ui/default/staff/Gruntfile.js b/Open-ILS/web/js/ui/default/staff/Gruntfile.js index 13ae1dabb2..c64eb44780 100644 --- a/Open-ILS/web/js/ui/default/staff/Gruntfile.js +++ b/Open-ILS/web/js/ui/default/staff/Gruntfile.js @@ -28,6 +28,7 @@ module.exports = function(grunt) { 'node_modules/angular-hotkeys/build/hotkeys.min.js', 'node_modules/angular-file-saver/dist/angular-file-saver.bundle.min.js', 'node_modules/angular-location-update/angular-location-update.min.js', + 'node_modules/angular-tree-control/context-menu.js', 'node_modules/angular-tree-control/angular-tree-control.js', 'node_modules/ng-toast/dist/ngToast.min.js', 'node_modules/angular-cookies/angular-cookies.min.js', @@ -155,6 +156,7 @@ module.exports = function(grunt) { 'build/js/ui-bootstrap.min.js', 'build/js/ui-bootstrap-tpls.js', 'build/js/hotkeys.min.js', + 'build/js/context-menu.js', 'build/js/angular-tree-control.js', 'build/js/ngToast.min.js', 'build/js/lovefield.min.js', -- 2.11.0