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

More consistent event types

Browse Source
This commit is contained in:
Tim Schaub
2013-12-11 16:26:33 -07:00
parent 625007f364
commit 69385f4ff0
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/object.js
+5 -4
View File
@@ -21,7 +21,7 @@ goog.require('ol.Observable');
* @enum {string} * @enum {string}
*/ */
ol.ObjectEventType = { ol.ObjectEventType = {
BEFORECHANGE: 'beforechange', BEFOREPROPERTYCHANGE: 'beforepropertychange',
PROPERTYCHANGE: 'propertychange' PROPERTYCHANGE: 'propertychange'
}; };
@@ -258,7 +258,7 @@ ol.Object.prototype.bindTo = function(key, target, opt_targetKey) {
// listen for beforechange events and relay if key matches // listen for beforechange events and relay if key matches
this.beforeChangeListeners_[key] = goog.events.listen(target, this.beforeChangeListeners_[key] = goog.events.listen(target,
ol.ObjectEventType.BEFORECHANGE, ol.ObjectEventType.BEFOREPROPERTYCHANGE,
this.createBeforeChangeListener_(key, targetKey), this.createBeforeChangeListener_(key, targetKey),
undefined, this); undefined, this);
@@ -288,7 +288,7 @@ ol.Object.prototype.createBeforeChangeListener_ = function(key, targetKey) {
return function(event) { return function(event) {
if (event.key === targetKey) { if (event.key === targetKey) {
this.dispatchEvent( this.dispatchEvent(
new ol.ObjectEvent(ol.ObjectEventType.BEFORECHANGE, key)); new ol.ObjectEvent(ol.ObjectEventType.BEFOREPROPERTYCHANGE, key));
} }
}; };
}; };
@@ -408,7 +408,8 @@ ol.Object.prototype.notifyInternal_ = function(key) {
* @todo stability experimental * @todo stability experimental
*/ */
ol.Object.prototype.set = function(key, value) { ol.Object.prototype.set = function(key, value) {
this.dispatchEvent(new ol.ObjectEvent(ol.ObjectEventType.BEFORECHANGE, key)); this.dispatchEvent(
new ol.ObjectEvent(ol.ObjectEventType.BEFOREPROPERTYCHANGE, key));
var accessors = ol.Object.getAccessors(this); var accessors = ol.Object.getAccessors(this);
if (accessors.hasOwnProperty(key)) { if (accessors.hasOwnProperty(key)) {
var accessor = accessors[key]; var accessor = accessors[key];
test/spec/ol/object.test.js
+6 -6
View File
@@ -175,7 +175,7 @@ describe('ol.Object', function() {
var beforeListener = sinon.spy(function(event) { var beforeListener = sinon.spy(function(event) {
oldValue = o2.get(event.key); oldValue = o2.get(event.key);
}); });
o.on(ol.ObjectEventType.BEFORECHANGE, beforeListener); o.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
o.set('k', 2); o.set('k', 2);
expect(beforeListener.calledOnce).to.be(true); expect(beforeListener.calledOnce).to.be(true);
@@ -211,7 +211,7 @@ describe('ol.Object', function() {
var beforeListener = sinon.spy(function(event) { var beforeListener = sinon.spy(function(event) {
oldValue = o2.get(event.key); oldValue = o2.get(event.key);
}); });
o.on(ol.ObjectEventType.BEFORECHANGE, beforeListener); o.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
o2.set('k', 2); o2.set('k', 2);
expect(beforeListener.calledOnce).to.be(true); expect(beforeListener.calledOnce).to.be(true);
@@ -234,7 +234,7 @@ describe('ol.Object', function() {
var beforeListener = sinon.spy(function(event) { var beforeListener = sinon.spy(function(event) {
oldValue = object.get(event.key); oldValue = object.get(event.key);
}); });
object.on(ol.ObjectEventType.BEFORECHANGE, beforeListener); object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
target.set('foo', 'new value'); target.set('foo', 'new value');
expect(beforeListener.calledOnce).to.be(true); expect(beforeListener.calledOnce).to.be(true);
@@ -258,7 +258,7 @@ describe('ol.Object', function() {
var beforeListener = sinon.spy(function(event) { var beforeListener = sinon.spy(function(event) {
oldValue = object.get(event.key); oldValue = object.get(event.key);
}); });
object.on(ol.ObjectEventType.BEFORECHANGE, beforeListener); object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
target.set('foo', 'new value'); target.set('foo', 'new value');
expect(beforeListener.calledOnce).to.be(true); expect(beforeListener.calledOnce).to.be(true);
@@ -359,7 +359,7 @@ describe('ol.Object', function() {
object.bindTo('foo', target); object.bindTo('foo', target);
var listener = sinon.spy(); var listener = sinon.spy();
object.on(ol.ObjectEventType.BEFORECHANGE, listener); object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, listener);
target.set('foo', 'new value'); target.set('foo', 'new value');
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);
@@ -384,7 +384,7 @@ describe('ol.Object', function() {
object.bindTo('bar', target); object.bindTo('bar', target);
var listener = sinon.spy(); var listener = sinon.spy();
object.on(ol.ObjectEventType.BEFORECHANGE, listener); object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, listener);
target.set('foo', 'new foo'); target.set('foo', 'new foo');
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);