Skip to content

Commit

Permalink
Universalizing access and quoting rules.
Browse files Browse the repository at this point in the history
  • Loading branch information
Tom MacWright committed Apr 12, 2011
1 parent b63f890 commit 0450c0e
Showing 1 changed file with 10 additions and 10 deletions.
20 changes: 10 additions & 10 deletions control/ol/interaction.js
Expand Up @@ -36,10 +36,10 @@ wax.ol.Interaction =
this.clickHandler.activate();

map.events.on({
'addlayer': this.resetLayers,
'changelayer': this.resetLayers,
'removelayer': this.resetLayers,
'changebaselayer': this.resetLayers,
addlayer: this.resetLayers,
changelayer: this.resetLayers,
removelayer: this.resetLayers,
changebaselayer: this.resetLayers,
scope: this
});

Expand Down Expand Up @@ -108,7 +108,7 @@ wax.ol.Interaction =
if (feature) {
switch (that.clickAction) {
case 'full':
that.callbacks['click'](feature, tiles[t].layer.map.viewPortDiv, t);
that.callbacks.click(feature, tiles[t].layer.map.viewPortDiv, t);
break;
case 'location':
window.location = feature;
Expand Down Expand Up @@ -140,20 +140,20 @@ wax.ol.Interaction =
if (!tiles[t]) return;
if (feature && that.feature[t] !== feature) {
that.feature[t] = feature;
that.callbacks['out'] (feature, tiles[t].layer.map.div, t, evt);
that.callbacks['over'](feature, tiles[t].layer.map.div, t, evt);
that.callbacks.out(feature, tiles[t].layer.map.div, t, evt);
that.callbacks.over(feature, tiles[t].layer.map.div, t, evt);
} else if (!feature) {
that.feature[t] = null;
that.callbacks['out'](feature, tiles[t].layer.map.div, t, evt);
that.callbacks.out(feature, tiles[t].layer.map.div, t, evt);
}
} else {
// Request this feature
// TODO(tmcw) re-add layer
that.feature[t] = null;
if (tiles[t]) {
that.callbacks['out']({}, tiles[t].layer.map.div, t, evt);
that.callbacks.out({}, tiles[t].layer.map.div, t, evt);
} else {
that.callbacks['out']({}, false, t);
that.callbacks.out({}, false, t);
}
}
}
Expand Down

0 comments on commit 0450c0e

Please sign in to comment.