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

Merge pull request #1588 from twpayne/event-properties

Browse Source 
Use properties, not get* methods, in events
This commit is contained in:
Tom Payne
2014-01-29 06:23:30 -08:00
parent 73490be2b9 318fc68159
commit d4db171a3c
49 changed files with 228 additions and 257 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/spec/ol/collection.test.js
View File

@@ -117,7 +117,7 @@ describe('ol.collection', function() {
goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb);
expect(collection.remove(1)).to.eql(1);
expect(cb).to.be.called();
expect(cb.lastCall.args[0].getElement()).to.eql(1);
expect(cb.lastCall.args[0].element).to.eql(1);
});
it('does not remove more than one matching element', function() {
var collection = new ol.Collection([0, 1, 1, 2]);
@@ -138,11 +138,11 @@ describe('ol.collection', function() {
var collection = new ol.Collection(['a', 'b']);
var added, removed;
goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) {
added = e.getElement();
added = e.element;
});
goog.events.listen(
collection, ol.CollectionEventType.REMOVE, function(e) {
removed = e.getElement();
removed = e.element;
});
collection.setAt(1, 1);
expect(added).to.eql(1);
@@ -156,7 +156,7 @@ describe('ol.collection', function() {
var removed;
goog.events.listen(
collection, ol.CollectionEventType.REMOVE, function(e) {
removed = e.getElement();
removed = e.element;
});
collection.pop();
expect(removed).to.eql('a');
@@ -169,7 +169,7 @@ describe('ol.collection', function() {
var added;
goog.events.listen(
collection, ol.CollectionEventType.ADD, function(e) {
added = e.getElement();
added = e.element;
});
collection.insertAt(1, 1);
expect(added).to.eql(1);
@@ -181,7 +181,7 @@ describe('ol.collection', function() {
var added = [];
goog.events.listen(
collection, ol.CollectionEventType.ADD, function(e) {
added.push(e.getElement());
added.push(e.element);
});
collection.setAt(2, 0);
expect(collection.getLength()).to.eql(3);
@@ -230,7 +230,7 @@ describe('ol.collection', function() {
var collection = new ol.Collection();
var elem;
goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) {
elem = e.getElement();
elem = e.element;
});
collection.push(1);
expect(elem).to.eql(1);
@@ -249,15 +249,15 @@ describe('ol.collection', function() {
goog.events.listen(collection, ol.CollectionEventType.ADD, cb1);
goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb2);
collection.setAt(0, 2);
expect(cb2.lastCall.args[0].getElement()).to.eql(1);
expect(cb1.lastCall.args[0].getElement()).to.eql(2);
expect(cb2.lastCall.args[0].element).to.eql(1);
expect(cb1.lastCall.args[0].element).to.eql(2);
});
});
describe('pop', function() {
it('triggers remove', function() {
goog.events.listen(collection, ol.CollectionEventType.REMOVE, cb1);
collection.pop();
expect(cb1.lastCall.args[0].getElement()).to.eql(1);
expect(cb1.lastCall.args[0].element).to.eql(1);
});
});
});
@@ -274,7 +274,7 @@ describe('ol.collection', function() {
var collection = new ol.Collection();
var elems = [];
goog.events.listen(collection, ol.CollectionEventType.ADD, function(e) {
elems.push(e.getElement());
elems.push(e.element);
});
collection.extend([1, 2]);
expect(elems).to.eql([1, 2]);

37
test/spec/ol/mapbrowserevent.test.js
View File

@@ -6,16 +6,21 @@ describe('ol.MapBrowserEventHandler', function() {
var handler;
var singleclickSpy;
var dblclickSpy;
var target;
beforeEach(function() {
clock = sinon.useFakeTimers();
handler = new ol.MapBrowserEventHandler(new ol.Map({}));
target = goog.dom.createElement(goog.dom.TagName.DIV);
handler = new ol.MapBrowserEventHandler(new ol.Map({
target: target
}));
singleclickSpy = sinon.spy();
goog.events.listen(handler, 'singleclick', singleclickSpy);
dblclickSpy = sinon.spy();
goog.events.listen(handler, 'dblclick', dblclickSpy);
});
afterEach(function() {
@@ -23,7 +28,12 @@ describe('ol.MapBrowserEventHandler', function() {
});
it('emulates click', function() {
handler.emulateClick_();
handler.emulateClick_(new goog.events.BrowserEvent({
type: 'mousedown',
target: target,
clientX: 0,
clientY: 0
}));
expect(singleclickSpy.called).to.not.be.ok();
expect(dblclickSpy.called).to.not.be.ok();
@@ -31,17 +41,32 @@ describe('ol.MapBrowserEventHandler', function() {
expect(singleclickSpy.calledOnce).to.be.ok();
expect(dblclickSpy.called).to.not.be.ok();
handler.emulateClick_();
handler.emulateClick_(new goog.events.BrowserEvent({
type: 'mousedown',
target: target,
clientX: 0,
clientY: 0
}));
expect(singleclickSpy.calledOnce).to.be.ok();
expect(dblclickSpy.called).to.not.be.ok();
});
it('emulates dblclick', function() {
handler.emulateClick_();
handler.emulateClick_({
type: 'mousedown',
target: target,
clientX: 0,
clientY: 0
});
expect(singleclickSpy.called).to.not.be.ok();
expect(dblclickSpy.called).to.not.be.ok();
handler.emulateClick_();
handler.emulateClick_(new goog.events.BrowserEvent({
type: 'mousedown',
target: target,
clientX: 0,
clientY: 0
}));
expect(singleclickSpy.called).to.not.be.ok();
expect(dblclickSpy.calledOnce).to.be.ok();
@@ -84,6 +109,8 @@ describe('ol.MapBrowserEventHandler', function() {
});
});
goog.require('goog.dom');
goog.require('goog.dom.TagName');
goog.require('goog.events');
goog.require('goog.events.BrowserEvent');
goog.require('ol.Map');

24
test/spec/ol/object.test.js
View File

@@ -125,7 +125,7 @@ describe('ol.Object', function() {
var args = listener2.firstCall.args;
expect(args).to.have.length(1);
var event = args[0];
expect(event.getKey()).to.be('k');
expect(event.key).to.be('k');
});
it('dispatches events to bound objects', function() {
@@ -165,7 +165,7 @@ describe('ol.Object', function() {
var args = listener2.firstCall.args;
expect(args).to.have.length(1);
var event = args[0];
expect(event.getKey()).to.be('k');
expect(event.key).to.be('k');
});
it('dispatches beforechange events to object', function() {
@@ -173,7 +173,7 @@ describe('ol.Object', function() {
var oldValue;
var beforeListener = sinon.spy(function(event) {
oldValue = o2.get(event.getKey());
oldValue = o2.get(event.key);
});
o.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
@@ -201,7 +201,7 @@ describe('ol.Object', function() {
var args = listener2.firstCall.args;
expect(args).to.have.length(1);
var event = args[0];
expect(event.getKey()).to.be('k');
expect(event.key).to.be('k');
});
it('dispatches beforechange before changing bound objects', function() {
@@ -209,7 +209,7 @@ describe('ol.Object', function() {
var oldValue;
var beforeListener = sinon.spy(function(event) {
oldValue = o2.get(event.getKey());
oldValue = o2.get(event.key);
});
o.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
@@ -218,7 +218,7 @@ describe('ol.Object', function() {
var args = beforeListener.firstCall.args;
expect(args).to.have.length(1);
var event = args[0];
expect(event.getKey()).to.be('k');
expect(event.key).to.be('k');
expect(oldValue).to.be(1);
});
@@ -232,7 +232,7 @@ describe('ol.Object', function() {
var oldValue;
var beforeListener = sinon.spy(function(event) {
oldValue = object.get(event.getKey());
oldValue = object.get(event.key);
});
object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
@@ -241,7 +241,7 @@ describe('ol.Object', function() {
var args = beforeListener.firstCall.args;
expect(args).to.have.length(1);
var event = args[0];
expect(event.getKey()).to.be('foo');
expect(event.key).to.be('foo');
expect(oldValue).to.be('original value');
expect(object.get('foo')).to.be('new value');
@@ -256,7 +256,7 @@ describe('ol.Object', function() {
var oldValue;
var beforeListener = sinon.spy(function(event) {
oldValue = object.get(event.getKey());
oldValue = object.get(event.key);
});
object.on(ol.ObjectEventType.BEFOREPROPERTYCHANGE, beforeListener);
@@ -265,7 +265,7 @@ describe('ol.Object', function() {
var args = beforeListener.firstCall.args;
expect(args).to.have.length(1);
var event = args[0];
expect(event.getKey()).to.be('bar');
expect(event.key).to.be('bar');
expect(oldValue).to.be('original value');
expect(object.get('bar')).to.be('new value');
@@ -365,7 +365,7 @@ describe('ol.Object', function() {
expect(listener.calledOnce).to.be(true);
var call = listener.firstCall;
expect(call.args).to.have.length(1);
expect(call.args[0].getKey()).to.be('foo');
expect(call.args[0].key).to.be('foo');
object.unbind('foo');
target.set('foo', 'another new value');
@@ -400,7 +400,7 @@ describe('ol.Object', function() {
expect(listener.callCount).to.be(3);
var lastCall = listener.getCall(2);
expect(lastCall.args).to.have.length(1);
expect(lastCall.args[0].getKey()).to.be('bar');
expect(lastCall.args[0].key).to.be('bar');
});
});