From 8196546ae61acb33c8cfec411377f3db4db06486 Mon Sep 17 00:00:00 2001 From: Thomas Berezansky Date: Wed, 3 Dec 2014 13:18:27 -0500 Subject: [PATCH] LP#1398926: Allow symbol popup to trigger on new marc fields Or rather, new MARC text entry boxes in general. Signed-off-by: Thomas Berezansky Signed-off-by: Jason Stephenson --- .../server/OpenILS/symbol_overlay.js | 22 ++++++++++++++----- .../xul/staff_client/server/cat/marcedit.js | 3 +++ 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/Open-ILS/xul/staff_client/server/OpenILS/symbol_overlay.js b/Open-ILS/xul/staff_client/server/OpenILS/symbol_overlay.js index f84a702250..dfae01f8b2 100644 --- a/Open-ILS/xul/staff_client/server/OpenILS/symbol_overlay.js +++ b/Open-ILS/xul/staff_client/server/OpenILS/symbol_overlay.js @@ -7,16 +7,26 @@ var el = {}; dojo.addOnLoad( function(){ dojo.query('.plain').forEach(function(node,index,arr){ - node.addEventListener("keypress", function(event) { - if (event.charCode == 115 && event.ctrlKey){ - setNod(node); - $('symbol-panel').openPopup(node, 'after_pointer' ); - } - }, true); + addSymbolTrigger(node); }); } ); +function addSymbolTrigger(node) { + if (!node.getAttribute('eg_has_symbol_trigger')) { + node.addEventListener( + "keypress", + function(event) { + if (event.charCode == 115 && event.ctrlKey){ + setNod(node); + $('symbol-panel').openPopup(node, 'after_pointer' ); + } + }, + true); + node.setAttribute('eg_has_symbol_trigger', 1); + } +} + function setNod(elm){ el = elm; } diff --git a/Open-ILS/xul/staff_client/server/cat/marcedit.js b/Open-ILS/xul/staff_client/server/cat/marcedit.js index ca07723173..0a9bf03441 100644 --- a/Open-ILS/xul/staff_client/server/cat/marcedit.js +++ b/Open-ILS/xul/staff_client/server/cat/marcedit.js @@ -619,6 +619,9 @@ function createMARCTextbox (element,attrs) { set_lock_on_keypress, false ); + if ($('symbol-panel')) { + addSymbolTrigger(box); + } box.onkeypress = function (event) { var root_node; var node = element; -- 2.43.2