ashatora/openlayers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Element.{show|hide}: check element before setting display. r=elemoine (closes #2652)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10682 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Frédéric Junod
2010-08-23 12:43:36 +00:00
parent 6e28a7cafd
commit 7295ffc9d4
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/OpenLayers/BaseTypes/Element.js
View File

@@ -47,7 +47,9 @@ OpenLayers.Element = {
hide: function() { hide: function() {
for (var i=0, len=arguments.length; i<len; i++) { for (var i=0, len=arguments.length; i<len; i++) {
var element = OpenLayers.Util.getElement(arguments[i]); var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = 'none'; if (element) {
element.style.display = 'none';
}
} }
}, },
@@ -61,7 +63,9 @@ OpenLayers.Element = {
show: function() { show: function() {
for (var i=0, len=arguments.length; i<len; i++) { for (var i=0, len=arguments.length; i<len; i++) {
var element = OpenLayers.Util.getElement(arguments[i]); var element = OpenLayers.Util.getElement(arguments[i]);
element.style.display = ''; if (element) {
element.style.display = '';
}
} }
}, },

4
tests/BaseTypes/Element.html
View File

@@ -60,7 +60,7 @@
} }
}; };
OpenLayers.Element.hide(elem1, elem2); OpenLayers.Element.hide(elem1, elem2, "do-not-exists");
t.eq(elem1.style.display, "none", "hidden element stays hidden"); t.eq(elem1.style.display, "none", "hidden element stays hidden");
t.eq(elem2.style.display, "none", "shown element hidden"); t.eq(elem2.style.display, "none", "shown element hidden");
@@ -81,7 +81,7 @@
} }
}; };
OpenLayers.Element.show(elem1, elem2); OpenLayers.Element.show(elem1, "do-not-exists", elem2);
t.eq(elem1.style.display, "", "hidden element shown"); t.eq(elem1.style.display, "", "hidden element shown");
t.eq(elem2.style.display, "", "shown element stays shown"); t.eq(elem2.style.display, "", "shown element stays shown");