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

step toward standardization of id policy... for popups

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@1416 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2006-09-08 04:51:32 +00:00
parent 31692f51fe
commit 899101ef0b
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/OpenLayers/Popup.js
+5 -3
View File
@@ -7,7 +7,6 @@
*/ */
OpenLayers.Popup = Class.create(); OpenLayers.Popup = Class.create();
OpenLayers.Popup.count = 0;
OpenLayers.Popup.WIDTH = 200; OpenLayers.Popup.WIDTH = 200;
OpenLayers.Popup.HEIGHT = 200; OpenLayers.Popup.HEIGHT = 200;
OpenLayers.Popup.COLOR = "white"; OpenLayers.Popup.COLOR = "white";
@@ -56,8 +55,11 @@ OpenLayers.Popup.prototype = {
* @param {String} contentHTML * @param {String} contentHTML
*/ */
initialize:function(id, lonlat, size, contentHTML) { initialize:function(id, lonlat, size, contentHTML) {
OpenLayers.Popup.count += 1; if (id == null) {
this.id = (id != null) ? id : "Popup" + OpenLayers.Popup.count; id = OpenLayers.Util.createUniqueID(this.CLASS_NAME + "_");
}
this.id = id;
this.lonlat = lonlat; this.lonlat = lonlat;
this.size = (size != null) ? size this.size = (size != null) ? size
: new OpenLayers.Size( : new OpenLayers.Size(
tests/test_Popup.html
+4 -6
View File
@@ -12,7 +12,8 @@
popup = new OpenLayers.Popup(); popup = new OpenLayers.Popup();
t.ok( popup instanceof OpenLayers.Popup, "new OpenLayers.Popup returns Popup object" ); t.ok( popup instanceof OpenLayers.Popup, "new OpenLayers.Popup returns Popup object" );
t.ok(popup.id.startsWith("Popup"), "good default popup.id"); t.ok(popup.id.startsWith("OpenLayers.Popup"), "valid default popupid");
var firstID = popup.id;
t.ok(popup.size.equals(size), "good default popup.size"); t.ok(popup.size.equals(size), "good default popup.size");
t.eq(popup.contentHTML, "", "good default popup.contentHTML"); t.eq(popup.contentHTML, "", "good default popup.contentHTML");
t.eq(popup.backgroundColor, OpenLayers.Popup.COLOR, "good default popup.backgroundColor"); t.eq(popup.backgroundColor, OpenLayers.Popup.COLOR, "good default popup.backgroundColor");
@@ -20,12 +21,9 @@
t.eq(popup.border, OpenLayers.Popup.BORDER, "good default popup.border"); t.eq(popup.border, OpenLayers.Popup.BORDER, "good default popup.border");
var oldIndex = parseInt(popup.id.slice("Popup".length));
popup = new OpenLayers.Popup(); popup = new OpenLayers.Popup();
var newIndex = parseInt(popup.id.slice("Popup".length)); var newID = popup.id;
t.ok(newID != firstID, "default id generator creating unique ids");
t.eq(newIndex, oldIndex + 1, "default id generator incrementing correctly");
} }
function test_02_Popup_constructor (t) { function test_02_Popup_constructor (t) {