[open-ils-commits] [GIT] Evergreen ILS branch rel_2_5 updated. 781f489efe44468db53bff2a8333cd0621667f54
Evergreen Git
git at git.evergreen-ils.org
Tue Dec 17 14:41:33 EST 2013
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, rel_2_5 has been updated
via 781f489efe44468db53bff2a8333cd0621667f54 (commit)
via 88cd3947a1b8394bd0307cbd2f6eedb8e98e3668 (commit)
from bdf6be3f19cdae07834b8cf191541202063b1805 (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 781f489efe44468db53bff2a8333cd0621667f54
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Wed Dec 11 10:05:18 2013 -0500
Break out of focus() in cat/z3950.js if obj.active_services is undefined.
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/xul/staff_client/server/cat/z3950.js b/Open-ILS/xul/staff_client/server/cat/z3950.js
index 07763b2..d140e13 100644
--- a/Open-ILS/xul/staff_client/server/cat/z3950.js
+++ b/Open-ILS/xul/staff_client/server/cat/z3950.js
@@ -495,6 +495,7 @@ cat.z3950.prototype = {
'focus' : function() {
var obj = this;
var focus_me; var or_focus_me;
+ if (!obj.active_services) return;
for (var i = 0; i < obj.active_services.length; i++) {
if (obj.creds.hosts[ obj.data.server_unadorned ] && obj.creds.hosts[ obj.data.server_unadorned ].services[ obj.active_services[i] ]) {
var x = obj.creds.hosts[ obj.data.server_unadorned ].services[ obj.active_services[i] ].default_attr;
commit 88cd3947a1b8394bd0307cbd2f6eedb8e98e3668
Author: Jason Stephenson <jstephenson at mvlc.org>
Date: Wed Dec 11 09:50:09 2013 -0500
Eliminate an annoying and useless warning in the JavaScript Console.
Timestamp: 12/10/2013 02:52:51 PM
Warning: Empty string passed to getElementById().
Source File: oils://remote/xul/rel_3_0_20131206_120120/server/OpenILS/global_util.js
Line: 354
Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
Signed-off-by: Ben Shum <bshum at biblio.org>
diff --git a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
index d1be186..6a9332f 100644
--- a/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
+++ b/Open-ILS/xul/staff_client/chrome/content/OpenILS/global_util.js
@@ -351,69 +351,71 @@
}
}
var cmd = nodes[i].getAttribute('command');
- var cmd_el = document.getElementById(cmd);
- if (nodes[i].disabled == false && nodes[i].hidden == false) {
- var no_poke = nodes[i].getAttribute('oils_persist_no_poke');
- if (no_poke && no_poke == 'true') {
- // Timing issue for some checkboxes; don't poke them with an event
- dump('\tnot poking\n');
- } else {
- if (cmd_el) {
- dump('\tpoking @command\n');
- var evt = document.createEvent("Events");
- evt.initEvent( 'command', true, true );
- cmd_el.dispatchEvent(evt);
+ if (cmd) {
+ var cmd_el = document.getElementById(cmd);
+ if (nodes[i].disabled == false && nodes[i].hidden == false) {
+ var no_poke = nodes[i].getAttribute('oils_persist_no_poke');
+ if (no_poke && no_poke == 'true') {
+ // Timing issue for some checkboxes; don't poke them with an event
+ dump('\tnot poking\n');
} else {
- dump('\tpoking\n');
- var evt = document.createEvent("Events");
- evt.initEvent( 'command', true, true );
- nodes[i].dispatchEvent(evt);
+ if (cmd_el) {
+ dump('\tpoking @command\n');
+ var evt = document.createEvent("Events");
+ evt.initEvent( 'command', true, true );
+ cmd_el.dispatchEvent(evt);
+ } else {
+ dump('\tpoking\n');
+ var evt = document.createEvent("Events");
+ evt.initEvent( 'command', true, true );
+ nodes[i].dispatchEvent(evt);
+ }
}
}
- }
- if (cmd_el) {
- window.persist_helper_event_listeners.add(cmd_el,
- 'command',
- gen_event_handler('command',cmd_el),
- false
- );
- window.persist_helper_event_listeners.add(cmd_el,
- 'oils_persist',
- gen_oils_persist_handler( base_key, nodes[i] ),
- false
- );
- } else {
- var node = nodes[i];
- var event_types = [];
- if (node.hasAttribute('oils_persist_events')) {
- var event_type_list = node.getAttribute('oils_persist_events').split(' ');
- for (var j = 0; j < event_type_list.length; j++) {
- event_types.push( event_type_list[j] );
- }
+ if (cmd_el) {
+ window.persist_helper_event_listeners.add(cmd_el,
+ 'command',
+ gen_event_handler('command',cmd_el),
+ false
+ );
+ window.persist_helper_event_listeners.add(cmd_el,
+ 'oils_persist',
+ gen_oils_persist_handler( base_key, nodes[i] ),
+ false
+ );
} else {
- if (node.nodeName == 'textbox') {
- event_types.push('change');
- } else if (node.nodeName == 'menulist') {
- event_types.push('select');
- } else if (node.nodeName == 'window') {
- event_types.push('resize');
- node = window; // xul window is an element of window.document
+ var node = nodes[i];
+ var event_types = [];
+ if (node.hasAttribute('oils_persist_events')) {
+ var event_type_list = node.getAttribute('oils_persist_events').split(' ');
+ for (var j = 0; j < event_type_list.length; j++) {
+ event_types.push( event_type_list[j] );
+ }
} else {
- event_types.push('command');
+ if (node.nodeName == 'textbox') {
+ event_types.push('change');
+ } else if (node.nodeName == 'menulist') {
+ event_types.push('select');
+ } else if (node.nodeName == 'window') {
+ event_types.push('resize');
+ node = window; // xul window is an element of window.document
+ } else {
+ event_types.push('command');
+ }
+ }
+ for (var j = 0; j < event_types.length; j++) {
+ window.persist_helper_event_listeners.add(node,
+ event_types[j],
+ gen_event_handler(event_types[j],node),
+ false
+ );
}
- }
- for (var j = 0; j < event_types.length; j++) {
window.persist_helper_event_listeners.add(node,
- event_types[j],
- gen_event_handler(event_types[j],node),
+ 'oils_persist',
+ gen_oils_persist_handler( base_key, node ),
false
);
}
- window.persist_helper_event_listeners.add(node,
- 'oils_persist',
- gen_oils_persist_handler( base_key, node ),
- false
- );
}
}
} catch(E) {
-----------------------------------------------------------------------
Summary of changes:
.../chrome/content/OpenILS/global_util.js | 108 ++++++++++----------
Open-ILS/xul/staff_client/server/cat/z3950.js | 1 +
2 files changed, 56 insertions(+), 53 deletions(-)
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list