Fixed opening issue

kevin-brown · kevin-brown · commit 8d35d5e41625 · 2015-01-13T19:09:04.000-05:00
This fixes an issue where the data set would not be queried when
the dropdown was opened.
diff --git a/dist/js/select2.amd.full.js b/dist/js/select2.amd.full.js
@@ -4159,14 +4159,14 @@ define('select2/core',[
 
           evt.preventDefault();
         } else if (key === KEYS.ESC || key === KEYS.TAB) {
-          self.trigger('close');
+          self.close();
 
           evt.preventDefault();
         }
       } else {
         if (key === KEYS.ENTER || key === KEYS.SPACE ||
             ((key === KEYS.DOWN || key === KEYS.UP) && evt.altKey)) {
-          self.trigger('open');
+          self.open();
 
           evt.preventDefault();
         }
@@ -4179,7 +4179,7 @@ define('select2/core',[
 
     if (this.options.get('disabled')) {
       if (this.isOpen()) {
-        this.trigger('close');
+        this.close();
       }
 
       this.trigger('disable');
@@ -4227,9 +4227,9 @@ define('select2/core',[
     }
 
     if (this.isOpen()) {
-      this.trigger('close');
+      this.close();
     } else {
-      this.trigger('open');
+      this.open();
     }
   };
 
diff --git a/dist/js/select2.amd.js b/dist/js/select2.amd.js
@@ -4159,14 +4159,14 @@ define('select2/core',[
 
           evt.preventDefault();
         } else if (key === KEYS.ESC || key === KEYS.TAB) {
-          self.trigger('close');
+          self.close();
 
           evt.preventDefault();
         }
       } else {
         if (key === KEYS.ENTER || key === KEYS.SPACE ||
             ((key === KEYS.DOWN || key === KEYS.UP) && evt.altKey)) {
-          self.trigger('open');
+          self.open();
 
           evt.preventDefault();
         }
@@ -4179,7 +4179,7 @@ define('select2/core',[
 
     if (this.options.get('disabled')) {
       if (this.isOpen()) {
-        this.trigger('close');
+        this.close();
       }
 
       this.trigger('disable');
@@ -4227,9 +4227,9 @@ define('select2/core',[
     }
 
     if (this.isOpen()) {
-      this.trigger('close');
+      this.close();
     } else {
-      this.trigger('open');
+      this.open();
     }
   };
 
diff --git a/dist/js/select2.full.js b/dist/js/select2.full.js
@@ -13694,14 +13694,14 @@ define('select2/core',[
 
           evt.preventDefault();
         } else if (key === KEYS.ESC || key === KEYS.TAB) {
-          self.trigger('close');
+          self.close();
 
           evt.preventDefault();
         }
       } else {
         if (key === KEYS.ENTER || key === KEYS.SPACE ||
             ((key === KEYS.DOWN || key === KEYS.UP) && evt.altKey)) {
-          self.trigger('open');
+          self.open();
 
           evt.preventDefault();
         }
@@ -13714,7 +13714,7 @@ define('select2/core',[
 
     if (this.options.get('disabled')) {
       if (this.isOpen()) {
-        this.trigger('close');
+        this.close();
       }
 
       this.trigger('disable');
@@ -13762,9 +13762,9 @@ define('select2/core',[
     }
 
     if (this.isOpen()) {
-      this.trigger('close');
+      this.close();
     } else {
-      this.trigger('open');
+      this.open();
     }
   };
 
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
@@ -4587,14 +4587,14 @@ define('select2/core',[
 
           evt.preventDefault();
         } else if (key === KEYS.ESC || key === KEYS.TAB) {
-          self.trigger('close');
+          self.close();
 
           evt.preventDefault();
         }
       } else {
         if (key === KEYS.ENTER || key === KEYS.SPACE ||
             ((key === KEYS.DOWN || key === KEYS.UP) && evt.altKey)) {
-          self.trigger('open');
+          self.open();
 
           evt.preventDefault();
         }
@@ -4607,7 +4607,7 @@ define('select2/core',[
 
     if (this.options.get('disabled')) {
       if (this.isOpen()) {
-        this.trigger('close');
+        this.close();
       }
 
       this.trigger('disable');
@@ -4655,9 +4655,9 @@ define('select2/core',[
     }
 
     if (this.isOpen()) {
-      this.trigger('close');
+      this.close();
     } else {
-      this.trigger('open');
+      this.open();
     }
   };
 
diff --git a/dist/js/select2.min.js b/dist/js/select2.min.js
diff --git a/docs/examples.html b/docs/examples.html
@@ -413,7 +413,7 @@ <h2>Example code</h2>
 <script type="text/x-example-code" class="js-code-multiple-limit">
 $(".js-example-basic-multiple-limit").select2({
   maximumSelectionLength: 2
-  });
+});
 </script>
     </div>
   </section>
diff --git a/src/js/select2/core.js b/src/js/select2/core.js
@@ -292,14 +292,14 @@ define([
 
           evt.preventDefault();
         } else if (key === KEYS.ESC || key === KEYS.TAB) {
-          self.trigger('close');
+          self.close();
 
           evt.preventDefault();
         }
       } else {
         if (key === KEYS.ENTER || key === KEYS.SPACE ||
             ((key === KEYS.DOWN || key === KEYS.UP) && evt.altKey)) {
-          self.trigger('open');
+          self.open();
 
           evt.preventDefault();
         }
@@ -312,7 +312,7 @@ define([
 
     if (this.options.get('disabled')) {
       if (this.isOpen()) {
-        this.trigger('close');
+        this.close();
       }
 
       this.trigger('disable');
@@ -360,9 +360,9 @@ define([
     }
 
     if (this.isOpen()) {
-      this.trigger('close');
+      this.close();
     } else {
-      this.trigger('open');
+      this.open();
     }
   };
 

Original file line number	Diff line number	Diff line change
`@@ -4159,14 +4159,14 @@ define('select2/core',[`
`4159`	`4159`
`4160`	`4160`	`evt.preventDefault();`
`4161`	`4161`	`} else if (key === KEYS.ESC \|\| key === KEYS.TAB) {`
`4162`		`- self.trigger('close');`
	`4162`	`+ self.close();`
`4163`	`4163`
`4164`	`4164`	`evt.preventDefault();`
`4165`	`4165`	`}`
`4166`	`4166`	`} else {`
`4167`	`4167`	`if (key === KEYS.ENTER \|\| key === KEYS.SPACE \|\|`
`4168`	`4168`	`((key === KEYS.DOWN \|\| key === KEYS.UP) && evt.altKey)) {`
`4169`		`- self.trigger('open');`
	`4169`	`+ self.open();`
`4170`	`4170`
`4171`	`4171`	`evt.preventDefault();`
`4172`	`4172`	`}`
`@@ -4179,7 +4179,7 @@ define('select2/core',[`
`4179`	`4179`
`4180`	`4180`	`if (this.options.get('disabled')) {`
`4181`	`4181`	`if (this.isOpen()) {`
`4182`		`- this.trigger('close');`
	`4182`	`+ this.close();`
`4183`	`4183`	`}`
`4184`	`4184`
`4185`	`4185`	`this.trigger('disable');`
`@@ -4227,9 +4227,9 @@ define('select2/core',[`
`4227`	`4227`	`}`
`4228`	`4228`
`4229`	`4229`	`if (this.isOpen()) {`
`4230`		`- this.trigger('close');`
	`4230`	`+ this.close();`
`4231`	`4231`	`} else {`
`4232`		`- this.trigger('open');`
	`4232`	`+ this.open();`
`4233`	`4233`	`}`
`4234`	`4234`	`};`
`4235`	`4235`
Original file line number	Diff line number	Diff line change
`@@ -13694,14 +13694,14 @@ define('select2/core',[`
`13694`	`13694`
`13695`	`13695`	`evt.preventDefault();`
`13696`	`13696`	`} else if (key === KEYS.ESC \|\| key === KEYS.TAB) {`
`13697`		`- self.trigger('close');`
	`13697`	`+ self.close();`
`13698`	`13698`
`13699`	`13699`	`evt.preventDefault();`
`13700`	`13700`	`}`
`13701`	`13701`	`} else {`
`13702`	`13702`	`if (key === KEYS.ENTER \|\| key === KEYS.SPACE \|\|`
`13703`	`13703`	`((key === KEYS.DOWN \|\| key === KEYS.UP) && evt.altKey)) {`
`13704`		`- self.trigger('open');`
	`13704`	`+ self.open();`
`13705`	`13705`
`13706`	`13706`	`evt.preventDefault();`
`13707`	`13707`	`}`
`@@ -13714,7 +13714,7 @@ define('select2/core',[`
`13714`	`13714`
`13715`	`13715`	`if (this.options.get('disabled')) {`
`13716`	`13716`	`if (this.isOpen()) {`
`13717`		`- this.trigger('close');`
	`13717`	`+ this.close();`
`13718`	`13718`	`}`
`13719`	`13719`
`13720`	`13720`	`this.trigger('disable');`
`@@ -13762,9 +13762,9 @@ define('select2/core',[`
`13762`	`13762`	`}`
`13763`	`13763`
`13764`	`13764`	`if (this.isOpen()) {`
`13765`		`- this.trigger('close');`
	`13765`	`+ this.close();`
`13766`	`13766`	`} else {`
`13767`		`- this.trigger('open');`
	`13767`	`+ this.open();`
`13768`	`13768`	`}`
`13769`	`13769`	`};`
`13770`	`13770`
Original file line number	Diff line number	Diff line change
`@@ -4587,14 +4587,14 @@ define('select2/core',[`
`4587`	`4587`
`4588`	`4588`	`evt.preventDefault();`
`4589`	`4589`	`} else if (key === KEYS.ESC \|\| key === KEYS.TAB) {`
`4590`		`- self.trigger('close');`
	`4590`	`+ self.close();`
`4591`	`4591`
`4592`	`4592`	`evt.preventDefault();`
`4593`	`4593`	`}`
`4594`	`4594`	`} else {`
`4595`	`4595`	`if (key === KEYS.ENTER \|\| key === KEYS.SPACE \|\|`
`4596`	`4596`	`((key === KEYS.DOWN \|\| key === KEYS.UP) && evt.altKey)) {`
`4597`		`- self.trigger('open');`
	`4597`	`+ self.open();`
`4598`	`4598`
`4599`	`4599`	`evt.preventDefault();`
`4600`	`4600`	`}`
`@@ -4607,7 +4607,7 @@ define('select2/core',[`
`4607`	`4607`
`4608`	`4608`	`if (this.options.get('disabled')) {`
`4609`	`4609`	`if (this.isOpen()) {`
`4610`		`- this.trigger('close');`
	`4610`	`+ this.close();`
`4611`	`4611`	`}`
`4612`	`4612`
`4613`	`4613`	`this.trigger('disable');`
`@@ -4655,9 +4655,9 @@ define('select2/core',[`
`4655`	`4655`	`}`
`4656`	`4656`
`4657`	`4657`	`if (this.isOpen()) {`
`4658`		`- this.trigger('close');`
	`4658`	`+ this.close();`
`4659`	`4659`	`} else {`
`4660`		`- this.trigger('open');`
	`4660`	`+ this.open();`
`4661`	`4661`	`}`
`4662`	`4662`	`};`
`4663`	`4663`
Original file line number	Diff line number	Diff line change
`@@ -292,14 +292,14 @@ define([`
`292`	`292`
`293`	`293`	`evt.preventDefault();`
`294`	`294`	`} else if (key === KEYS.ESC \|\| key === KEYS.TAB) {`
`295`		`- self.trigger('close');`
	`295`	`+ self.close();`
`296`	`296`
`297`	`297`	`evt.preventDefault();`
`298`	`298`	`}`
`299`	`299`	`} else {`
`300`	`300`	`if (key === KEYS.ENTER \|\| key === KEYS.SPACE \|\|`
`301`	`301`	`((key === KEYS.DOWN \|\| key === KEYS.UP) && evt.altKey)) {`
`302`		`- self.trigger('open');`
	`302`	`+ self.open();`
`303`	`303`
`304`	`304`	`evt.preventDefault();`
`305`	`305`	`}`
`@@ -312,7 +312,7 @@ define([`
`312`	`312`
`313`	`313`	`if (this.options.get('disabled')) {`
`314`	`314`	`if (this.isOpen()) {`
`315`		`- this.trigger('close');`
	`315`	`+ this.close();`
`316`	`316`	`}`
`317`	`317`
`318`	`318`	`this.trigger('disable');`
`@@ -360,9 +360,9 @@ define([`
`360`	`360`	`}`
`361`	`361`
`362`	`362`	`if (this.isOpen()) {`
`363`		`- this.trigger('close');`
	`363`	`+ this.close();`
`364`	`364`	`} else {`
`365`		`- this.trigger('open');`
	`365`	`+ this.open();`
`366`	`366`	`}`
`367`	`367`	`};`
`368`	`368`