From f5b09dcc183d61c5215258f153603b5e50d1ff62 Mon Sep 17 00:00:00 2001 From: Wolfgang Sourdeau Date: Mon, 11 Oct 2010 20:02:24 +0000 Subject: [PATCH] Monotone-Parent: 981cda3ffc1a7d110adade601696b1d342da3105 Monotone-Revision: 469c67c9e37bffb5b1edbabd90c1c5a55441c8c7 Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-10-11T20:02:24 Monotone-Branch: ca.inverse.sogo --- ChangeLog | 8 ++++++++ UI/WebServerResources/HTMLElement.js | 12 +++++++----- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f276c300..a6feeb102 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-10-11 Wolfgang Sourdeau + + * UI/WebServerResources/HTMLElement.js: + (Element.getSelectedNodesId): if the element has not + "selectedIds", set "selArray" to an empty array before checking + the "selectedElements" attribute. This enables the caller to not + check for a "null" return value. + 2010-10-08 Francis Lachapelle * UI/WebServerResources/generic.js (showConfirmDialog) diff --git a/UI/WebServerResources/HTMLElement.js b/UI/WebServerResources/HTMLElement.js index 56fb7bcf5..905d01beb 100644 --- a/UI/WebServerResources/HTMLElement.js +++ b/UI/WebServerResources/HTMLElement.js @@ -124,11 +124,13 @@ Element.addMethods({ if (element.selectedIds) { selArray = element.selectedIds; } - else if (element.selectedElements) { - selArray = new Array(); - for (var i = 0; i < element.selectedElements.length; i++) { - var node = element.selectedElements[i]; - selArray.push(node.getAttribute("id")); + else { + selArray = []; + if (element.selectedElements) { + for (var i = 0; i < element.selectedElements.length; i++) { + var node = element.selectedElements[i]; + selArray.push(node.getAttribute("id")); + } } }