Merge branch 'events'

src/ol/control/Attribution.js

@@ -43,9 +43,7 @@ ol.control.Attribution.prototype.setMap = function(map) {
     var staticOverlay = map.getStaticOverlay();
     if (goog.isNull(this.container_)) {
         this.container_ = goog.dom.createDom('div', this.CLS);
-        // This is not registered as priority listener, so priority listeners
+        goog.events.listen(this.container_, 'click', ol.event.stopPropagation);
-        // can still get the click event.
-        map.getEvents().register('click', this.stopLinkClick, this);
     }
     if (!goog.isNull(staticOverlay)) {
         goog.dom.append(staticOverlay, this.container_);
@@ -53,16 +51,6 @@ ol.control.Attribution.prototype.setMap = function(map) {
     goog.base(this, 'setMap', map);
 };
 
-/**
- * Prevent clicks on links in the attribution from getting through to
- * listeners.
- */
-ol.control.Attribution.prototype.stopLinkClick = function(evt) {
-    var node = evt.target;
-    return node.nodeName !== 'A' ||
-        !goog.dom.getAncestorByClass(node, this.CLS);
-};
-
 /** @inheritDoc */
 ol.control.Attribution.prototype.activate = function() {
     var active = goog.base(this, 'activate');
@@ -96,6 +84,7 @@ ol.control.Attribution.prototype.update = function() {
 };
 
 ol.control.Attribution.prototype.destroy = function() {
+    goog.events.unlisten(this.container_, 'click', ol.event.stopPropagation);
     goog.dom.removeNode(this.container_);
     goog.base(this, 'destroy');
 };

src/ol/control/Zoom.js

@@ -15,10 +15,20 @@ ol.control.Zoom = function(opt_autoActivate) {
     
     goog.base(this, opt_autoActivate);
 
+    /**
+     * @type {Node}
+     */
+    this.inButton_ = null;
+
+    /**
+     * @type {Node}
+     */
+    this.outButton_ = null;
+
     /**
      * Activate this control when it is added to a map.  Default is true.
      *
-     * @type {boolean} autoActivate
+     * @type {boolean} 
      */
     this.autoActivate_ =
         goog.isDef(opt_autoActivate) ? opt_autoActivate : true;
@@ -30,38 +40,38 @@ goog.inherits(ol.control.Zoom, ol.control.Control);
  * @param {ol.Map} map
  */
 ol.control.Zoom.prototype.setMap = function(map) {
-    goog.base(this, 'setMap', map);
     var container = goog.dom.createDom('div', ol.control.Zoom.RES.CLS);
-    var inButton = goog.dom.createDom(
+    this.inButton_ = goog.dom.createDom(
         'div', ol.control.Zoom.RES.IN_CLS,
         goog.dom.createDom('a', {'href': '#zoomIn'})
     );
     goog.dom.setTextContent(
-        /** @type {Element} */ (inButton.firstChild),
+        /** @type {Element} */ (this.inButton_.firstChild),
         ol.control.Zoom.RES.IN_TEXT
     );
-    var outButton = goog.dom.createDom(
+    this.outButton_ = goog.dom.createDom(
         'div', ol.control.Zoom.RES.OUT_CLS,
         goog.dom.createDom('a', {'href': '#zoomOut'})
     );
     goog.dom.setTextContent(
-        /** @type {Element} */ (outButton.firstChild),
+        /** @type {Element} */ (this.outButton_.firstChild),
         ol.control.Zoom.RES.OUT_TEXT
     );
-    goog.dom.append(container, inButton, outButton);
+    goog.dom.append(container, this.inButton_, this.outButton_);
 
     var overlay = map.getStaticOverlay();
     if (goog.isDefAndNotNull(overlay)) {
         goog.dom.append(overlay, container);
     }
+    goog.base(this, 'setMap', map);
 };
 
 /** @inheritDoc */
 ol.control.Zoom.prototype.activate = function() {
     var active = goog.base(this, 'activate');
     if (active) {
-        this.map_.getEvents().register('click', this.handle, this);
+        goog.events.listen(this.inButton_, 'click', this.handleIn, false, this);
-        this.map_.getEvents().register('keypress', this.handle, this);
+        goog.events.listen(this.outButton_, 'click', this.handleOut, false, this);
     }
     return active;
 };
@@ -70,37 +80,28 @@ ol.control.Zoom.prototype.activate = function() {
 ol.control.Zoom.prototype.deactivate = function() {
     var inactive = goog.base(this, 'deactivate');
     if (inactive) {
-        this.map_.getEvents().unregister('click', this.handle, this);
+        goog.events.unlisten(this.inButton_, 'click', this.handleIn, false, this);
-        this.map_.getEvents().unregister('keypress', this.handle, this);
+        goog.events.unlisten(this.outButton_, 'click', this.handleOut, false, this);
     }
     return inactive;
 };
 
 /**
  * @param {Event} evt
- * @return {boolean}
  */
-ol.control.Zoom.prototype.handle = function(evt) {
+ol.control.Zoom.prototype.handleIn = function(evt) {
-    var target = /** @type {Node} */ (evt.target),
+    this.map_.zoomIn();
-        handled = false;
+    evt.preventDefault();
-    if (evt.type === 'click' || ol.event.isEnterOrSpace(evt)) {
+    evt.stopPropagation();
-        if (goog.dom.getAncestorByClass(target, ol.control.Zoom.RES.IN_CLS)) {
+};
-            this.map_.zoomIn();
+
-            handled = true;
+/**
-        } else
+ * @param {Event} evt
-        if (goog.dom.getAncestorByClass(target, ol.control.Zoom.RES.OUT_CLS)) {
+ */
-            this.map_.zoomOut();
+ol.control.Zoom.prototype.handleOut = function(evt) {
-            handled = true;
+    this.map_.zoomOut();
-        }
+    evt.preventDefault();
-        if (handled) {
+    evt.stopPropagation();
-            // Stop default behavior (i.e. don't follow link to anchor)
-            evt.preventDefault();
-            // On Android 2.3, the above does not prevent the link from being
-            // followed, but stopPropagation does.
-            evt.stopPropagation();
-        }
-    }
-    return !handled;
 };
 
 ol.control.Zoom.prototype.destroy = function() {

src/ol/event/Drag.js

@@ -30,12 +30,22 @@ ol.event.Drag = function(target) {
      */
     this.dragger_ = dragger;
     
+    /**
+     * @private
+     * @type {ol.event.Events}
+     */
+    this.target_ = target;
+    
     // We want to swallow the click event that gets fired after dragging.
     var newSequence;
     function unregisterClickStopper() {
         target.unregister('click', goog.functions.FALSE, undefined, true);
     }
 
+    // no default for mousemove and touchmove events to avoid page scrolling.
+    target.register('mousemove', ol.event.preventDefault);
+    target.register('touchmove', ol.event.preventDefault);
+    
     dragger.defaultAction = function(x, y) {};                
     dragger.addEventListener(goog.fx.Dragger.EventType.START, function(evt) {
         evt.target = element;
@@ -75,8 +85,10 @@ ol.event.Drag = function(target) {
 
 /** @inheritDoc */
 ol.event.Drag.prototype.destroy = function() {
+    this.target_.unregister('mousemove', ol.event.preventDefault);
+    this.target_.unregister('touchmove', ol.event.preventDefault);
     this.dragger_.dispose();
-    delete this.dragger_;
+    goog.object.clear(this);
 };
 
 

src/ol/event/Events.js

@@ -42,16 +42,21 @@ ol.event.isMultiTouch = function(evt) {
 };
 
 /**
- * Is the event a keyboard event with Enter or Space pressed?
+ * Call preventDefault on the provided event.
  *
  * @param {!Event} evt
- * @return {boolean}
  */
-ol.event.isEnterOrSpace = function(evt) {
+ol.event.preventDefault = function(evt) {
-    return evt.type === "keypress" &&
+    evt.preventDefault();
-        (evt.keyCode === goog.events.KeyCodes.ENTER ||
+};
-        evt.keyCode === goog.events.KeyCodes.SPACE ||
+
-        evt.keyCode === goog.events.KeyCodes.MAC_ENTER);
+/**
+ * Call stopPropagation on the provided event.
+ *
+ * @param {!Event} evt
+ */
+ol.event.stopPropagation = function(evt) {
+    evt.stopPropagation();
 };
 
 
@@ -155,7 +160,7 @@ ol.event.Events.prototype.setElement = function(element) {
     if (this.element_) {
         for (t in types) {
             goog.events.unlisten(
-                this.element_, types[t], this.handleBrowserEvent, true, this
+                this.element_, types[t], this.handleBrowserEvent, false, this
             );
         }
         this.destroySequences();
@@ -166,7 +171,7 @@ ol.event.Events.prototype.setElement = function(element) {
         this.createSequences();
         for (t in types) {
             goog.events.listen(
-                element, types[t], this.handleBrowserEvent, true, this
+                element, types[t], this.handleBrowserEvent, false, this
             );
         }
     }