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

Make enum property name like its value

Browse Source 
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).
This commit is contained in:
Tim Schaub
2013-12-11 16:19:59 -07:00
parent c8985b9906
commit 625007f364
6 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ol/layer/layergroup.js
+2 -2
View File
@@ -106,7 +106,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
layer = layersArray[i]; layer = layersArray[i];
this.listenerKeys_[goog.getUid(layer).toString()] = this.listenerKeys_[goog.getUid(layer).toString()] =
goog.events.listen(layer, goog.events.listen(layer,
[ol.ObjectEventType.CHANGE, goog.events.EventType.CHANGE], [ol.ObjectEventType.PROPERTYCHANGE, goog.events.EventType.CHANGE],
this.handleLayerChange_, false, this); this.handleLayerChange_, false, this);
} }
} }
@@ -122,7 +122,7 @@ ol.layer.Group.prototype.handleLayersChanged_ = function(event) {
ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) { ol.layer.Group.prototype.handleLayersAdd_ = function(collectionEvent) {
var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement()); var layer = /** @type {ol.layer.Base} */ (collectionEvent.getElement());
this.listenerKeys_[goog.getUid(layer).toString()] = goog.events.listen( 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.handleLayerChange_, false, this);
this.dispatchChangeEvent(); this.dispatchChangeEvent();
}; };
src/ol/map.js
+2 -2
View File
@@ -889,7 +889,7 @@ ol.Map.prototype.handleViewChanged_ = function() {
var view = this.getView(); var view = this.getView();
if (goog.isDefAndNotNull(view)) { if (goog.isDefAndNotNull(view)) {
this.viewPropertyListenerKey_ = goog.events.listen( this.viewPropertyListenerKey_ = goog.events.listen(
view, ol.ObjectEventType.CHANGE, view, ol.ObjectEventType.PROPERTYCHANGE,
this.handleViewPropertyChanged_, false, this); this.handleViewPropertyChanged_, false, this);
} }
this.render(); this.render();
@@ -931,7 +931,7 @@ ol.Map.prototype.handleLayerGroupChanged_ = function() {
if (goog.isDefAndNotNull(layerGroup)) { if (goog.isDefAndNotNull(layerGroup)) {
this.layerGroupPropertyListenerKeys_ = [ this.layerGroupPropertyListenerKeys_ = [
goog.events.listen( goog.events.listen(
layerGroup, ol.ObjectEventType.CHANGE, layerGroup, ol.ObjectEventType.PROPERTYCHANGE,
this.handleLayerGroupPropertyChanged_, false, this), this.handleLayerGroupPropertyChanged_, false, this),
goog.events.listen( goog.events.listen(
layerGroup, goog.events.EventType.CHANGE, layerGroup, goog.events.EventType.CHANGE,
src/ol/object.js
+3 -2
View File
@@ -22,7 +22,7 @@ goog.require('ol.Observable');
*/ */
ol.ObjectEventType = { ol.ObjectEventType = {
BEFORECHANGE: 'beforechange', BEFORECHANGE: 'beforechange',
CHANGE: 'propertychange' PROPERTYCHANGE: 'propertychange'
}; };
@@ -396,7 +396,8 @@ ol.Object.prototype.notify = function(key) {
ol.Object.prototype.notifyInternal_ = function(key) { ol.Object.prototype.notifyInternal_ = function(key) {
var eventType = ol.Object.getChangeEventType(key); var eventType = ol.Object.getChangeEventType(key);
this.dispatchEvent(eventType); this.dispatchEvent(eventType);
this.dispatchEvent(new ol.ObjectEvent(ol.ObjectEventType.CHANGE, key)); this.dispatchEvent(
new ol.ObjectEvent(ol.ObjectEventType.PROPERTYCHANGE, key));
}; };
test/spec/ol/layer/layer.test.js
+6 -6
View File
@@ -212,7 +212,7 @@ describe('ol.layer.Layer', function() {
it('triggers a change event', function() { it('triggers a change event', function() {
var listener = sinon.spy(); var listener = sinon.spy();
layer.on(ol.ObjectEventType.CHANGE, listener); layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.setBrightness(0.5); layer.setBrightness(0.5);
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);
}); });
@@ -247,7 +247,7 @@ describe('ol.layer.Layer', function() {
it('triggers a change event', function() { it('triggers a change event', function() {
var listener = sinon.spy(); var listener = sinon.spy();
layer.on(ol.ObjectEventType.CHANGE, listener); layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.setContrast(43); layer.setContrast(43);
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);
}); });
@@ -293,7 +293,7 @@ describe('ol.layer.Layer', function() {
it('triggers a change event', function() { it('triggers a change event', function() {
var listener = sinon.spy(); var listener = sinon.spy();
layer.on(ol.ObjectEventType.CHANGE, listener); layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.setHue(0.5); layer.setHue(0.5);
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);
}); });
@@ -324,7 +324,7 @@ describe('ol.layer.Layer', function() {
it('triggers a change event', function() { it('triggers a change event', function() {
var listener = sinon.spy(); var listener = sinon.spy();
layer.on(ol.ObjectEventType.CHANGE, listener); layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.setOpacity(0.4); layer.setOpacity(0.4);
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);
}); });
@@ -360,7 +360,7 @@ describe('ol.layer.Layer', function() {
it('triggers a change event', function() { it('triggers a change event', function() {
var listener = sinon.spy(); var listener = sinon.spy();
layer.on(ol.ObjectEventType.CHANGE, listener); layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.setSaturation(42); layer.setSaturation(42);
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);
}); });
@@ -393,7 +393,7 @@ describe('ol.layer.Layer', function() {
it('fires a change event', function() { it('fires a change event', function() {
var listener = sinon.spy(); var listener = sinon.spy();
layer.on(ol.ObjectEventType.CHANGE, listener); layer.on(ol.ObjectEventType.PROPERTYCHANGE, listener);
layer.setVisible(false); layer.setVisible(false);
expect(listener.callCount).to.be(1); expect(listener.callCount).to.be(1);
test/spec/ol/layer/layergroup.test.js
+2 -2
View File
@@ -123,14 +123,14 @@ describe('ol.layer.Group', function() {
}); });
it('is dispatched by the group when group opacity changes', 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); group.setOpacity(0.5);
expect(listener.calledOnce).to.be(true); expect(listener.calledOnce).to.be(true);
}); });
it('is dispatched by the group when group visibility changes', function() { 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); group.setVisible(false);
expect(listener.callCount).to.be(1); expect(listener.callCount).to.be(1);
test/spec/ol/object.test.js
+2 -2
View File
@@ -106,7 +106,7 @@ describe('ol.Object', function() {
goog.events.listen(o, 'change:k', listener1); goog.events.listen(o, 'change:k', listener1);
listener2 = sinon.spy(); listener2 = sinon.spy();
goog.events.listen(o, ol.ObjectEventType.CHANGE, listener2); goog.events.listen(o, ol.ObjectEventType.PROPERTYCHANGE, listener2);
var o2 = new ol.Object(); var o2 = new ol.Object();
o2.bindTo('k', o); o2.bindTo('k', o);
@@ -143,7 +143,7 @@ describe('ol.Object', function() {
goog.events.listen(o, 'change:k', listener1); goog.events.listen(o, 'change:k', listener1);
listener2 = sinon.spy(); listener2 = sinon.spy();
goog.events.listen(o, ol.ObjectEventType.CHANGE, listener2); goog.events.listen(o, ol.ObjectEventType.PROPERTYCHANGE, listener2);
o2 = new ol.Object(); o2 = new ol.Object();
o2.bindTo('k', o); o2.bindTo('k', o);