prevent touch scroll from bubbling

janikoskela · Feb 25, 2015 · 89496da · 89496da
1 parent 2c78771
commit 89496da
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/src/dist/select.js b/src/dist/select.js
@@ -1422,6 +1422,8 @@ SELECT.ELEMENTS.WIDGET.SubWrapper.prototype = Object.create(SELECT.ELEMENTS.Elem
         });
         this.element.addEventListener("keyup", onKeyUp.bind(this));
         this.element.addEventListener("keydown", onKeyDown.bind(this));
+        this.element.addEventListener("touchmove", touchScroll.bind(this));
+        this.element.addEventListener("scroll", touchScroll.bind(this));
 
         var widgetSubWrapper = Facade.subscribe("WidgetSubWrapper", new SELECT.ELEMENTS.WIDGET.SubWrapper(Facade));
         var widgetSubWrapperElem = widgetSubWrapper.render();
@@ -1446,6 +1448,11 @@ SELECT.ELEMENTS.WIDGET.SubWrapper.prototype = Object.create(SELECT.ELEMENTS.Elem
         this.element.setAttribute("tabindex", this.tabIndex);
     }
 
+    function touchScroll(e) {
+        e.stopPropagation();
+        return false;
+    }
+
     function onKeyDown(e) {
         if (this.locked === true)
             return;

diff --git a/src/dist/select.min.js b/src/dist/select.min.js
diff --git a/src/dist/select.min.js.gz b/src/dist/select.min.js.gz
diff --git a/src/select/elements/widget/WidgetWrapper.js b/src/select/elements/widget/WidgetWrapper.js
@@ -30,6 +30,8 @@ SELECT.ELEMENTS.WIDGET.Wrapper = function(Facade) {
         });
         this.element.addEventListener("keyup", onKeyUp.bind(this));
         this.element.addEventListener("keydown", onKeyDown.bind(this));
+        this.element.addEventListener("touchmove", touchScroll.bind(this));
+        this.element.addEventListener("scroll", touchScroll.bind(this));
 
         var widgetSubWrapper = Facade.subscribe("WidgetSubWrapper", new SELECT.ELEMENTS.WIDGET.SubWrapper(Facade));
         var widgetSubWrapperElem = widgetSubWrapper.render();
@@ -54,6 +56,11 @@ SELECT.ELEMENTS.WIDGET.Wrapper = function(Facade) {
         this.element.setAttribute("tabindex", this.tabIndex);
     }
 
+    function touchScroll(e) {
+        e.stopPropagation();
+        return false;
+    }
+
     function onKeyDown(e) {
         if (this.locked === true)
             return;