Merged branch 1.2.x-dev into master

samuelmc · Mar 8, 2017 · 9bbfd16 · 9bbfd16
2 parents 04633cf + cb6c81f
commit 9bbfd16
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 1 deletion.
diff --git a/dist/js/foundation.select.js b/dist/js/foundation.select.js
@@ -233,6 +233,7 @@ function _classCallCheck(instance, Constructor) { if (!(instance instanceof Cons
             value: function _events() {
                 var _this = this;
                 this.$element.off('mousewheel.zf.select').on('mousewheel.zf.select', function (e) {
+                    e.preventDefault();
                     if (e.originalEvent.deltaY > 0) _this._selectArrowDown(e);else _this._selectArrowUp(e);
                 }).add(this.$dropdown).off('keybord.zf.dropdown').on('keydown.zf.select', function (e) {
                     Foundation.Keyboard.handleKey(e, 'Select', {

diff --git a/dist/js/foundation.select.min.js b/dist/js/foundation.select.min.js
diff --git a/src/js/foundation.select.js b/src/js/foundation.select.js
@@ -218,6 +218,7 @@
             this.$element
                 .off('mousewheel.zf.select')
                 .on('mousewheel.zf.select', (e) => {
+                    e.preventDefault();
                     if (e.originalEvent.deltaY > 0) _this._selectArrowDown(e);
                     else _this._selectArrowUp(e);
                 })