From 625007f3644e3d00982ea8ada1c4571d0511c679 Mon Sep 17 00:00:00 2001 From: Tim Schaub Date: Wed, 11 Dec 2013 16:19:59 -0700 Subject: [PATCH] Make enum property name like its value Where an enum value is used as an event type, it should be alllowercase (to follow DOM events). Property names should be ALLUPPERCASE in this case (just as camelCase and PascalCase are converted to CONSTANT_CASE). --- src/ol/layer/layergroup.js | 4 ++-- src/ol/map.js | 4 ++-- src/ol/object.js | 5 +++-- test/spec/ol/layer/layer.test.js | 12 ++++++------ test/spec/ol/layer/layergroup.test.js | 4 ++-- test/spec/ol/object.test.js | 4 ++-- 6 files changed, 17 insertions(+), 16 deletions(-) diff --git a/src/ol/layer/layergroup.js b/src/ol/layer/layergroup.js index 2afe59ca8e..6f154543ac 100644 --- a/src/ol/layer/layergroup.js +++ b/src/ol/layer/layergroup.js @@ -106,7 +106,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) { layer = layersArray[i]; this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen(layer, - [ol.ObjectEventType.CHANGE, goog.events.EventType.CHANGE], + [ol.ObjectEventType.PROPERTYCHANGE, goog.events.EventType.CHANGE], this.handleLayerChange_, false, this); } } @@ -122,7 +122,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) { ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) { var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement()); this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen( - layer, [ol.ObjectEventType.CHANGE, goog.events.EventType.CHANGE], + layer, [ol.ObjectEventType.PROPERTYCHANGE, goog.events.EventType.CHANGE], this.handleLayerChange_, false, this); this.dispatchChangeEvent(); }; diff --git a/src/ol/map.js b/src/ol/map.js index d8ced68de7..31e50d9da8 100644 --- a/src/ol/map.js +++ b/src/ol/map.js @@ -889,7 +889,7 @@ ol.Map.prototype.handleViewChanged_ = function() { var view = this.getView(); if (goog.isDefAndNotNull(view)) { this.viewPropertyListenerKey_ = goog.events.listen( - view, ol.ObjectEventType.CHANGE, + view, ol.ObjectEventType.PROPERTYCHANGE, this.handleViewPropertyChanged_, false, this); } this.render(); @@ -931,7 +931,7 @@ ol.Map.prototype.handleLayerGroupChanged_ = function() { if (goog.isDefAndNotNull(layerGroup)) { this.layerGroupPropertyListenerKeys_ = [ goog.events.listen( - layerGroup, ol.ObjectEventType.CHANGE, + layerGroup, ol.ObjectEventType.PROPERTYCHANGE, this.handleLayerGroupPropertyChanged_, false, this), goog.events.listen( layerGroup, goog.events.EventType.CHANGE, diff --git a/src/ol/object.js b/src/ol/object.js index 40e1fd65b3..859e9ad6e8 100644 --- a/src/ol/object.js +++ b/src/ol/object.js @@ -22,7 +22,7 @@ goog.require('ol.Observable'); */ ol.ObjectEventType = { BEFORECHANGE: 'beforechange', - CHANGE: 'propertychange' + PROPERTYCHANGE: 'propertychange' }; @@ -396,7 +396,8 @@ ol.Object.prototype.notify = function(key) { ol.Object.prototype.notifyInternal_ = function(key) { var eventType = ol.Object.getChangeEventType(key); this.dispatchEvent(eventType); - this.dispatchEvent(new ol.ObjectEvent(ol.ObjectEventType.CHANGE, key)); + this.dispatchEvent( + new ol.ObjectEvent(ol.ObjectEventType.PROPERTYCHANGE, key)); }; diff --git a/test/spec/ol/layer/layer.test.js b/test/spec/ol/layer/layer.test.js index 8fd23001e3..4d8f1b516c 100644 --- a/test/spec/ol/layer/layer.test.js +++ b/test/spec/ol/layer/layer.test.js @@ -212,7 +212,7 @@ describe('ol.layer.Layer', function() { it('triggers a change event', function() { var listener = sinon.spy(); - layer.on(ol.ObjectEventType.CHANGE, listener); + layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener); layer.setBrightness(0.5); expect(listener.calledOnce).to.be(true); }); @@ -247,7 +247,7 @@ describe('ol.layer.Layer', function() { it('triggers a change event', function() { var listener = sinon.spy(); - layer.on(ol.ObjectEventType.CHANGE, listener); + layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener); layer.setContrast(43); expect(listener.calledOnce).to.be(true); }); @@ -293,7 +293,7 @@ describe('ol.layer.Layer', function() { it('triggers a change event', function() { var listener = sinon.spy(); - layer.on(ol.ObjectEventType.CHANGE, listener); + layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener); layer.setHue(0.5); expect(listener.calledOnce).to.be(true); }); @@ -324,7 +324,7 @@ describe('ol.layer.Layer', function() { it('triggers a change event', function() { var listener = sinon.spy(); - layer.on(ol.ObjectEventType.CHANGE, listener); + layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener); layer.setOpacity(0.4); expect(listener.calledOnce).to.be(true); }); @@ -360,7 +360,7 @@ describe('ol.layer.Layer', function() { it('triggers a change event', function() { var listener = sinon.spy(); - layer.on(ol.ObjectEventType.CHANGE, listener); + layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener); layer.setSaturation(42); expect(listener.calledOnce).to.be(true); }); @@ -393,7 +393,7 @@ describe('ol.layer.Layer', function() { it('fires a change event', function() { var listener = sinon.spy(); - layer.on(ol.ObjectEventType.CHANGE, listener); + layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener); layer.setVisible(false); expect(listener.callCount).to.be(1); diff --git a/test/spec/ol/layer/layergroup.test.js b/test/spec/ol/layer/layergroup.test.js index 14263e7e7f..d3a29cfd15 100644 --- a/test/spec/ol/layer/layergroup.test.js +++ b/test/spec/ol/layer/layergroup.test.js @@ -123,14 +123,14 @@ describe('ol.layer.Group', function() { }); it('is dispatched by the group when group opacity changes', function() { - group.on(ol.ObjectEventType.CHANGE, listener); + group.on(ol.ObjectEventType.PROPERTYCHANGE, listener); group.setOpacity(0.5); expect(listener.calledOnce).to.be(true); }); it('is dispatched by the group when group visibility changes', function() { - group.on(ol.ObjectEventType.CHANGE, listener); + group.on(ol.ObjectEventType.PROPERTYCHANGE, listener); group.setVisible(false); expect(listener.callCount).to.be(1); diff --git a/test/spec/ol/object.test.js b/test/spec/ol/object.test.js index b18f84401a..794a7f0d43 100644 --- a/test/spec/ol/object.test.js +++ b/test/spec/ol/object.test.js @@ -106,7 +106,7 @@ describe('ol.Object', function() { goog.events.listen(o, 'change:k', listener1); listener2 = sinon.spy(); - goog.events.listen(o, ol.ObjectEventType.CHANGE, listener2); + goog.events.listen(o, ol.ObjectEventType.PROPERTYCHANGE, listener2); var o2 = new ol.Object(); o2.bindTo('k', o); @@ -143,7 +143,7 @@ describe('ol.Object', function() { goog.events.listen(o, 'change:k', listener1); listener2 = sinon.spy(); - goog.events.listen(o, ol.ObjectEventType.CHANGE, listener2); + goog.events.listen(o, ol.ObjectEventType.PROPERTYCHANGE, listener2); o2 = new ol.Object(); o2.bindTo('k', o);