Merge branch 'master' of https://github.com/openlayers/ol3

test/spec/ol/Events.test.js

@@ -4,10 +4,28 @@ describe("ol.Events", 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.element_).toBe(element);
+        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("respects event priority", function() {
+        var log = [], events = new ol.event.Events("foo");
+        events.register("bar", function() {log.push("normal");});
+        events.register(
+            "bar", function() {log.push("priority");}, undefined, true);
+        events.triggerEvent("bar");
+        expect(log[0]).toBe("priority");
+        expect(log[1]).toBe("normal");
     });
     
 });

test/spec/ol/Map.test.js

@@ -133,7 +133,6 @@ describe("ol.Map", function() {
         expect(proj instanceof ol.Projection).toBe(true);
         expect(proj.code()).toBe("EPSG:4326");
         
-        debugger;
         map.center([10, 20]);
         
         map.userProjection("EPSG:3857");