Merge pull request #19 from databox/improvement/scroll-after-select

Improvement/scroll after select
databox · Mar 3, 2019 · f012fe0 · f012fe0
2 parents c51341a + 6870338
commit f012fe0
Show file tree

Hide file tree

Showing 6 changed files with 38 additions and 11 deletions.
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -1099,7 +1099,9 @@ S2.define('select2/results',[
 
       if (container.isOpen()) {
         self.setClasses();
-        self.highlightFirstItem();
+        if (self.options.get('scrollAfterSelect')) {
+          self.highlightFirstItem();
+        }
       }
 
       if (self.options.options.enableHorizontalScroll) {
@@ -1127,7 +1129,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('unselect', function () {
@@ -1136,7 +1141,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('open', function () {
@@ -5215,6 +5223,7 @@ S2.define('select2/defaults',[
       selectOnClose: false,
       setTitle: false,
       attachToContainer: false,
+      scrollAfterSelect: true,
       sorter: function (data) {
         return data;
       },

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
@@ -1099,7 +1099,9 @@ S2.define('select2/results',[
 
       if (container.isOpen()) {
         self.setClasses();
-        self.highlightFirstItem();
+        if (self.options.get('scrollAfterSelect')) {
+          self.highlightFirstItem();
+        }
       }
 
       if (self.options.options.enableHorizontalScroll) {
@@ -1127,7 +1129,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('unselect', function () {
@@ -1136,7 +1141,10 @@ S2.define('select2/results',[
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('open', function () {
@@ -5215,6 +5223,7 @@ S2.define('select2/defaults',[
       selectOnClose: false,
       setTitle: false,
       attachToContainer: false,
+      scrollAfterSelect: true,
       sorter: function (data) {
         return data;
       },

diff --git a/dist/js/select2.min.js b/dist/js/select2.min.js
diff --git a/src/js/select2/defaults.js b/src/js/select2/defaults.js
@@ -374,6 +374,7 @@ define([
       selectOnClose: false,
       setTitle: false,
       attachToContainer: false,
+      scrollAfterSelect: true,
       sorter: function (data) {
         return data;
       },

diff --git a/src/js/select2/results.js b/src/js/select2/results.js
@@ -322,7 +322,9 @@ define([
 
       if (container.isOpen()) {
         self.setClasses();
-        self.highlightFirstItem();
+        if (self.options.get('scrollAfterSelect')) {
+          self.highlightFirstItem();
+        }
       }
 
       if (self.options.options.enableHorizontalScroll) {
@@ -350,7 +352,10 @@ define([
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('unselect', function () {
@@ -359,7 +364,10 @@ define([
       }
 
       self.setClasses();
-      self.highlightFirstItem();
+
+      if (self.options.get('scrollAfterSelect')) {
+        self.highlightFirstItem();
+      }
     });
 
     container.on('open', function () {