remove ol.event entirely
This commit is contained in:
@@ -74,7 +74,6 @@
|
||||
<script type="text/javascript" src="jasmine-extensions.js"></script>
|
||||
|
||||
<!-- include spec files here... -->
|
||||
<script type="text/javascript" src="spec/ol/Events.test.js"></script>
|
||||
<script type="text/javascript" src="spec/ol/UnreferencedBounds.test.js"></script>
|
||||
<script type="text/javascript" src="spec/ol/Projection.test.js"></script>
|
||||
<script type="text/javascript" src="spec/ol/Bounds.test.js"></script>
|
||||
|
||||
@@ -1,175 +0,0 @@
|
||||
describe("ol.event.Events", function() {
|
||||
|
||||
var log = [],
|
||||
logFn = function(e) {log.push({scope: this, evt: e});};
|
||||
|
||||
|
||||
it("constructs instances", function() {
|
||||
var events, element = document.createElement("div");
|
||||
|
||||
events = new ol.event.Events("foo");
|
||||
expect(events.getObject()).toBe("foo");
|
||||
expect(events.getElement()).toBe(null);
|
||||
events.destroy();
|
||||
|
||||
events = new ol.event.Events("foo", element, true);
|
||||
expect(events.getElement()).toBe(element);
|
||||
expect(events.includeXY_).toBe(true);
|
||||
events.destroy();
|
||||
});
|
||||
|
||||
it("destroys properly", function() {
|
||||
var events = new ol.event.Events("foo");
|
||||
events.destroy();
|
||||
expect(events.getObject()).toBe(undefined);
|
||||
});
|
||||
|
||||
it("relays browser events and knows about pointer position", function() {
|
||||
var element = document.createElement("div"),
|
||||
events = new ol.event.Events("foo", element);
|
||||
|
||||
//TODO Figure out a good way to deal with fixtures
|
||||
element.style.position = "absolute";
|
||||
element.style.left = "5px";
|
||||
element.style.top = "10px";
|
||||
document.body.appendChild(element);
|
||||
// mock dom element so we can trigger events on it
|
||||
goog.object.extend(element, new goog.events.EventTarget());
|
||||
|
||||
log = [];
|
||||
events.register("click", logFn);
|
||||
element.dispatchEvent("click");
|
||||
expect(log.length).toBe(1);
|
||||
|
||||
// detach from the element
|
||||
events.setElement(null);
|
||||
element.dispatchEvent("click");
|
||||
expect(log.length).toBe(1);
|
||||
|
||||
// attach to the element again
|
||||
events.setElement(element);
|
||||
events.setIncludeXY(true);
|
||||
element.dispatchEvent({
|
||||
type: "click",
|
||||
touches: [{clientX: 9, clientY: 22}, {clientX: 11, clientY: 18}]
|
||||
});
|
||||
expect(log.length).toBe(2);
|
||||
expect(log[1].evt.xy.x).toBe(5);
|
||||
expect(log[1].evt.xy.y).toBe(10);
|
||||
expect(log[1].evt.clientX).toBe(10);
|
||||
expect(log[1].evt.clientY).toBe(20);
|
||||
|
||||
events.destroy();
|
||||
document.body.removeChild(element);
|
||||
});
|
||||
|
||||
it("calls listeners with a scope and an event object", function() {
|
||||
var scope = {}, evt = {}, events = new ol.event.Events("foo");
|
||||
|
||||
log = [];
|
||||
events.register("bar", logFn, scope);
|
||||
events.triggerEvent("bar", evt);
|
||||
expect(log[0].scope).toBe(scope);
|
||||
expect(log[0].evt).toBe(evt);
|
||||
expect(log[0].evt.object).toBe("foo");
|
||||
});
|
||||
|
||||
it("respects event priority", function() {
|
||||
var log = [], events = new ol.event.Events("foo");
|
||||
|
||||
// register a normal listener
|
||||
events.register("bar", function() {log.push("normal");});
|
||||
// register a priority listener
|
||||
events.register(
|
||||
"bar", function() {log.push("priority");}, undefined, true);
|
||||
events.triggerEvent("bar");
|
||||
expect(log[0]).toBe("priority");
|
||||
expect(log[1]).toBe("normal");
|
||||
|
||||
events.destroy();
|
||||
});
|
||||
|
||||
it("allows to abort the event chain", function() {
|
||||
var events = new ol.event.Events("foo");
|
||||
|
||||
log = [];
|
||||
// register a listener that aborts the event chain
|
||||
events.register("bar", function(e) {logFn(e); return false;});
|
||||
// register a listener that just does something
|
||||
events.register("bar", logFn);
|
||||
events.triggerEvent("bar");
|
||||
expect(log.length).toBe(1);
|
||||
|
||||
log = [];
|
||||
// register a priority listener that just does something
|
||||
events.register("bar", logFn, undefined, true);
|
||||
events.triggerEvent("bar");
|
||||
expect(log.length).toBe(2);
|
||||
|
||||
events.destroy();
|
||||
});
|
||||
|
||||
it("allows to unregister events", function() {
|
||||
var events = new ol.event.Events("foo");
|
||||
|
||||
log = [];
|
||||
events.register("bar", logFn);
|
||||
expect(events.listenerCount_["bar"]).toBe(1);
|
||||
|
||||
events.triggerEvent("bar");
|
||||
expect(log.length).toBe(1);
|
||||
|
||||
events.unregister("bar", logFn);
|
||||
events.triggerEvent("bar");
|
||||
expect(log.length).toBe(1);
|
||||
|
||||
events.unregister("bar", logFn);
|
||||
expect(events.listenerCount_["bar"]).toBe(0);
|
||||
|
||||
events.destroy();
|
||||
});
|
||||
|
||||
it("can be extended with sequences implementing ol.event.ISequence", function() {
|
||||
var sequence;
|
||||
var Sequence = function(target) {
|
||||
sequence = this;
|
||||
this.target = target;
|
||||
};
|
||||
Sequence.prototype.fire = function() {
|
||||
this.target.triggerEvent("myevent");
|
||||
};
|
||||
Sequence.prototype.destroy = function() {
|
||||
this.destroyed = true;
|
||||
};
|
||||
ol.event.addSequenceProvider("myseq", Sequence);
|
||||
|
||||
var element = document.createElement("div");
|
||||
events = new ol.event.Events("foo", undefined, false, ["myseq"]);
|
||||
|
||||
expect(sequence).toBeUndefined();
|
||||
|
||||
log = [];
|
||||
events.setElement(element);
|
||||
events.register('myevent', logFn);
|
||||
sequence.fire();
|
||||
|
||||
expect(log.length).toBe(1);
|
||||
expect(log[0].evt.type).toBe("myevent");
|
||||
|
||||
events.destroy();
|
||||
expect(sequence.destroyed).toBe(true);
|
||||
});
|
||||
|
||||
it("provides an isSingleTouch() function", function() {
|
||||
expect(ol.event.isSingleTouch({touches: [{}, {}]})).toBe(false);
|
||||
expect(ol.event.isSingleTouch({touches: [{}]})).toBe(true);
|
||||
expect(ol.event.isSingleTouch({})).toBe(false);
|
||||
});
|
||||
|
||||
it("provides an isMultiTouch() function", function() {
|
||||
expect(ol.event.isMultiTouch({touches: [{}, {}]})).toBe(true);
|
||||
expect(ol.event.isMultiTouch({touches: [{}]})).toBe(false);
|
||||
expect(ol.event.isMultiTouch({})).toBe(false);
|
||||
});
|
||||
|
||||
});
|
||||
Reference in New Issue
Block a user