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

Keep the 'loadstart' event from firing twice on the Layer.Text. r=elemoine, cr5 (Closes #1696)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@7865 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
euzuro
2008-08-26 17:17:19 +00:00
parent 00192b64ab
commit 0eadc40e27
2 changed files with 55 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/OpenLayers/Layer/Text.js
View File

@@ -132,7 +132,6 @@ OpenLayers.Layer.Text = OpenLayers.Class(OpenLayers.Layer.Markers, {
moveTo:function(bounds, zoomChanged, minor) {
OpenLayers.Layer.Markers.prototype.moveTo.apply(this, arguments);
if(this.visibility && !this.loaded){
this.events.triggerEvent("loadstart");
this.loadText();
}
},

55
tests/Layer/Text.html
View File

@@ -58,6 +58,61 @@
*/
});;
}
function test_Layer_Text_moveTo(t) {
t.plan(16);
temp = OpenLayers.Layer.Markers.prototype.moveTo;
g_Bounds = {};
g_ZoomChanged = {};
g_Minor = {};
var args = [g_Bounds, g_ZoomChanged, g_Minor];
OpenLayers.Layer.Markers.prototype.moveTo =
function(bounds, zoomChanged, minor) {
t.ok(bounds == g_Bounds, "correct bounds passed to Markers superclass");
t.ok(zoomChanged == g_ZoomChanged, "correct zoomChanged passed to Markers superclass");
t.ok(minor == g_Minor, "correct minor passed to Markers superclass");
}
var layer = {
'loadText': function() { g_TextLoaded = true; }
};
//visibility true, loaded true
layer.visibility = true;
layer.loaded = true;
g_TextLoaded = false;
OpenLayers.Layer.Text.prototype.moveTo.apply(layer, args);
t.ok(g_TextLoaded == false, "text not loaded when visibility true, loaded true");
//visibility true, loaded false
layer.visibility = true;
layer.loaded = false;
g_TextLoaded = false;
OpenLayers.Layer.Text.prototype.moveTo.apply(layer, args);
t.ok(g_TextLoaded == true, "text is loaded when visibility true, loaded false");
//visibility false, loaded true
layer.visibility = false;
layer.loaded = true;
g_TextLoaded = false;
OpenLayers.Layer.Text.prototype.moveTo.apply(layer, args);
t.ok(g_TextLoaded == false, "text not loaded when visibility false, loaded true");
//visibility false, loaded false
layer.visibility = false;
layer.loaded = false;
g_TextLoaded = false;
OpenLayers.Layer.Text.prototype.moveTo.apply(layer, args);
t.ok(g_TextLoaded == false, "text not loaded when visibility false, loaded false");
OpenLayers.Layer.Markers.prototype.moveTo = temp;
}
function test_Layer_Text_events (t) {
t.plan( 5 );
layer = new OpenLayers.Layer.Text('Test Layer', { location: datafile2 });