Merge branch 'next' of https://github.com/byte916/Semantic-UI into next

fomantic · Sep 16, 2018 · cbcdc61 · cbcdc61
2 parents bd47451 + e49faf0
commit cbcdc61
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/src/definitions/modules/dimmer.js b/src/definitions/modules/dimmer.js
@@ -113,10 +113,6 @@ $.fn.dimmer = function(parameters) {
 
         bind: {
           events: function() {
-            if(module.is.page()) {
-              // touch events default to passive, due to changes in chrome to optimize mobile perf
-              $dimmable.get(0).addEventListener('touchmove', module.event.preventScroll, { passive: false });
-            }
             if(settings.on == 'hover') {
               $dimmable
                 .on('mouseenter' + eventNamespace, module.show)
@@ -144,9 +140,6 @@ $.fn.dimmer = function(parameters) {
 
         unbind: {
           events: function() {
-            if(module.is.page()) {
-              $dimmable.get(0).removeEventListener('touchmove', module.event.preventScroll, { passive: false });
-            }
             $module
               .removeData(moduleNamespace)
             ;
@@ -204,6 +197,11 @@ $.fn.dimmer = function(parameters) {
             module.animate.show(callback);
             settings.onShow.call(element);
             settings.onChange.call(element);
+
+            if(module.is.page()) {
+              // touch events default to passive, due to changes in chrome to optimize mobile perf
+              $dimmable.get(0).addEventListener('touchmove', module.event.preventScroll, { passive: false });
+            }
           }
           else {
             module.debug('Dimmer is already shown or disabled');
@@ -220,6 +218,10 @@ $.fn.dimmer = function(parameters) {
             module.animate.hide(callback);
             settings.onHide.call(element);
             settings.onChange.call(element);
+
+            if(module.is.page()) {
+              $dimmable.get(0).removeEventListener('touchmove', module.event.preventScroll, { passive: false });
+            }
           }
           else {
             module.debug('Dimmer is not visible');