Merge pull request #26 from databox/bugfix/scroll-disabled-after-sele…

…cting-in-modal Bugfix/Scroll disabled after selecting in modal
databox · Jul 17, 2020 · f001ba7 · f001ba7
2 parents a1fd7bf + 1b2704f
commit f001ba7
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 5 deletions.
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -4748,9 +4748,12 @@ S2.define('select2/dropdown/attachBody',[
       });
     });
 
+    // Similar issue described in https://github.com/select2/select2/issues/4236
     $watchers.on(scrollEvent, function (ev) {
       var position = Utils.GetData(this, 'select2-scroll-position');
-      $(this).scrollTop(position.y);
+      if ($(this).find('.select2-container--open').length) {
+        $(this).scrollTop(position.y);
+      }
     });
 
     $(window).on(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent,

diff --git a/dist/js/select2.full.min.js b/dist/js/select2.full.min.js
diff --git a/dist/js/select2.js b/dist/js/select2.js
@@ -4748,9 +4748,12 @@ S2.define('select2/dropdown/attachBody',[
       });
     });
 
+    // Similar issue described in https://github.com/select2/select2/issues/4236
     $watchers.on(scrollEvent, function (ev) {
       var position = Utils.GetData(this, 'select2-scroll-position');
-      $(this).scrollTop(position.y);
+      if ($(this).find('.select2-container--open').length) {
+        $(this).scrollTop(position.y);
+      }
     });
 
     $(window).on(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent,

diff --git a/dist/js/select2.min.js b/dist/js/select2.min.js
diff --git a/src/js/select2/dropdown/attachBody.js b/src/js/select2/dropdown/attachBody.js
@@ -121,9 +121,12 @@ define([
       });
     });
 
+    // Similar issue described in https://github.com/select2/select2/issues/4236
     $watchers.on(scrollEvent, function (ev) {
       var position = Utils.GetData(this, 'select2-scroll-position');
-      $(this).scrollTop(position.y);
+      if ($(this).find('.select2-container--open').length) {
+        $(this).scrollTop(position.y);
+      }
     });
 
     $(window).on(scrollEvent + ' ' + resizeEvent + ' ' + orientationEvent,