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

Set the olCursorWait class when selecting by box and hover. r=elemoine (closes #2664)

Browse Source 
git-svn-id: http://svn.openlayers.org/trunk/openlayers@10379 dc9f47b5-9b13-0410-9fdd-eb0c1a62fdaf
This commit is contained in:
Frédéric Junod
2010-06-08 07:56:32 +00:00
parent a69a0d2164
commit fd6c16bb6c
2 changed files with 32 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
lib/OpenLayers/Control/GetFeature.js
View File

@@ -291,9 +291,6 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
* evt - {<OpenLayers.Event>}
*/
selectClick: function(evt) {
// Set the cursor to "wait" to tell the user we're working on their click.
OpenLayers.Element.addClass(this.map.viewPortDiv, "olCursorWait");
var bounds = this.pixelToBounds(evt.xy);
this.setModifiers(evt);
@@ -351,6 +348,8 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
if (this.hoverResponse) {
this.protocol.abort(this.hoverResponse);
this.hoverResponse = null;
OpenLayers.Element.removeClass(this.map.viewPortDiv, "olCursorWait");
}
},
@@ -375,6 +374,9 @@ OpenLayers.Control.GetFeature = OpenLayers.Class(OpenLayers.Control, {
value: bounds
});
// Set the cursor to "wait" to tell the user we're working.
OpenLayers.Element.addClass(this.map.viewPortDiv, "olCursorWait");
var response = this.protocol.read({
maxFeatures: options.single == true ? this.maxFeatures : undefined,
filter: filter,

29
tests/Control/GetFeature.html
View File

@@ -22,7 +22,8 @@
}
function test_Control_GetFeature_select(t) {
t.plan(6);
t.plan(10);
var cssAdded;
var map = new OpenLayers.Map("map");
var layer = new OpenLayers.Layer.WMS("foo", "wms", {
layers: "foo"
@@ -35,6 +36,8 @@
var control = new OpenLayers.Control.GetFeature({
protocol: new OpenLayers.Protocol({
read: function(obj) {
cssAdded = OpenLayers.Element.hasClass(map.viewPortDiv,
"olCursorWait");
obj.callback.call(obj.scope, {
features: [feature1, feature2, feature3],
success: function() {return true;}
@@ -48,8 +51,13 @@
var singleTest = function(evt) {
t.eq(evt.feature.id, feature1.id, "featureselected callback called with closest feature");
}
cssAdded = false;
control.events.register("featureselected", this, singleTest);
control.selectClick({xy: new OpenLayers.Pixel(200, 125)});
t.ok(cssAdded,
"select adds CSS class (click)");
t.ok(!OpenLayers.Element.hasClass(map.viewPortDiv, "olCursorWait"),
"callback removes CSS class (click)");
control.events.unregister("featureselected", this, singleTest);
var count = 0;
@@ -71,6 +79,7 @@
control.events.register("featureselected", this, boxTest);
control.events.register("beforefeaturesselected", this, beforeFeaturesSelected);
control.events.register("featuresselected", this, featuresSelected);
cssAdded = false;
control.selectBox(new OpenLayers.Bounds(0,0,4,4));
control.events.unregister("beforefeatureselected", this, beforeFeatureSelected);
control.events.unregister("featureselected", this, boxTest);
@@ -78,6 +87,10 @@
control.events.unregister("featuresselected", this, featuresSelected);
t.eq(features.length, 2, "2 features inside box selected");
t.eq(features[1].id, feature2.id, "featureselected callback called with multiple features");
t.ok(cssAdded,
"select adds CSS class (box)");
t.ok(!OpenLayers.Element.hasClass(map.viewPortDiv, "olCursorWait"),
"callback removes CSS class (box)");
// allow several features even for single click
control.single = false;
@@ -90,7 +103,8 @@
}
function test_Control_GetFeature_hover(t) {
t.plan(6);
t.plan(9);
var cssAdded;
var abortedResponse = null;
var map = new OpenLayers.Map("map");
var layer = new OpenLayers.Layer.WMS("foo", "wms", {
@@ -104,6 +118,8 @@
var control = new OpenLayers.Control.GetFeature({
protocol: new OpenLayers.Protocol({
read: function(obj){
cssAdded = OpenLayers.Element.hasClass(map.viewPortDiv,
"olCursorWait");
obj.callback.call(obj.scope, {
features: [feature1, feature2],
success: function() {return true;}
@@ -133,12 +149,21 @@
"selectHover stores the protocol response in the hoverResponse property");
hoverFeature = feature2;
cssAdded = false;
control.selectHover({xy: new OpenLayers.Pixel(400, 0)});
t.ok(cssAdded,
"select adds CSS class (hover)");
t.ok(!OpenLayers.Element.hasClass(map.viewPortDiv, "olCursorWait"),
"callback removes CSS class (hover)");
OpenLayers.Element.addClass(map.viewPortDiv, "olCursorWait");
control.cancelHover();
t.ok(abortedResponse == response,
"cancelHover calls protocol.abort() with the expected response");
t.eq(control.hoverResponse, null,
"cancelHover sets this.hoverResponse to null");
t.ok(!OpenLayers.Element.hasClass(map.viewPortDiv, "olCursorWait"),
"cancelHover removes CSS class");
control.events.unregister("hoverfeature", this, hoverTest);
control.events.unregister("outfeature", this, outTest);