update vendor to 0.8.5

manuelvanrijn · Nov 26, 2013 · b2627ca · b2627ca
1 parent a2b8e4c
commit b2627ca
Show file tree

Hide file tree

Showing 9 changed files with 24 additions and 19 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 | Version | Notes                                                       |
 | -------:| ----------------------------------------------------------- |
+|   0.8.5 | Update to v0.8.5 of selectize.js                            |
 |   0.8.4 | Update to v0.8.4 of selectize.js                            |
 |   0.8.3 | Update to v0.8.3 of selectize.js                            |
 |   0.8.1 | Update to v0.8.1 of selectize.js                            |

diff --git a/README.md b/README.md
@@ -41,11 +41,11 @@ See the [demo page of Brian Reavis](http://brianreavis.github.io/selectize.js/)
 
 | Version | Notes                                                       |
 | -------:| ----------------------------------------------------------- |
+|   0.8.5 | Update to v0.8.5 of selectize.js                            |
 |   0.8.4 | Update to v0.8.4 of selectize.js                            |
 |   0.8.3 | Update to v0.8.3 of selectize.js                            |
 |   0.8.1 | Update to v0.8.1 of selectize.js                            |
 |   0.8.0 | Update to v0.8.0 of selectize.js                            |
-|   0.7.7 | Update to v0.7.7 of selectize.js                            |
 
 [older](CHANGELOG.md)
 

diff --git a/lib/selectize-rails/version.rb b/lib/selectize-rails/version.rb
@@ -1,5 +1,5 @@
 module Selectize
   module Rails
-    VERSION = "0.8.4"
+    VERSION = "0.8.5"
   end
 end
diff --git a/vendor/assets/javascripts/selectize.js b/vendor/assets/javascripts/selectize.js
@@ -16,7 +16,7 @@
 
 (function(root, factory) {
 	if (typeof define === 'function' && define.amd) {
-		define(factory);
+		define('sifter', factory);
 	} else if (typeof exports === 'object') {
 		module.exports = factory();
 	} else {
@@ -464,7 +464,7 @@
 
 (function(root, factory) {
 	if (typeof define === 'function' && define.amd) {
-		define(factory);
+		define('microplugin', factory);
 	} else if (typeof exports === 'object') {
 		module.exports = factory();
 	} else {
@@ -583,7 +583,7 @@
 }));
 
 /**
- * selectize.js (v0.8.4)
+ * selectize.js (v0.8.5)
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -603,7 +603,7 @@
 
 (function(root, factory) {
 	if (typeof define === 'function' && define.amd) {
-		define(['jquery','sifter','microplugin'], factory);
+		define('selectize', ['jquery','sifter','microplugin'], factory);
 	} else {
 		root.Selectize = factory(root.jQuery, root.Sifter, root.MicroPlugin);
 	}
@@ -1799,12 +1799,15 @@
 		 * Selects all items (CTRL + A).
 		 */
 		selectAll: function() {
-			this.$activeItems = Array.prototype.slice.apply(this.$control.children(':not(input)').addClass('active'));
-			if (this.$activeItems.length) {
-				this.hideInput();
-				this.close();
+			var self = this;
+			if (self.settings.mode === 'single') return;
+
+			self.$activeItems = Array.prototype.slice.apply(self.$control.children(':not(input)').addClass('active'));
+			if (self.$activeItems.length) {
+				self.hideInput();
+				self.close();
 			}
-			this.focus();
+			self.focus();
 		},
 
 		/**
@@ -2633,6 +2636,7 @@
 			}
 
 			self.showInput();
+			self.positionDropdown();
 			self.refreshOptions(true);
 
 			// select previous option

diff --git a/vendor/assets/stylesheets/selectize.bootstrap2.css b/vendor/assets/stylesheets/selectize.bootstrap2.css
@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap2.css (v0.8.4) - Bootstrap 2 Theme
+ * selectize.bootstrap2.css (v0.8.5) - Bootstrap 2 Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

diff --git a/vendor/assets/stylesheets/selectize.bootstrap3.css b/vendor/assets/stylesheets/selectize.bootstrap3.css
@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap3.css (v0.8.4) - Bootstrap 3 Theme
+ * selectize.bootstrap3.css (v0.8.5) - Bootstrap 3 Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -297,12 +297,12 @@
 }
 
 .selectize-dropdown .active {
-  color: #ffffff;
-  background-color: #428bca;
+  color: #262626;
+  background-color: #f5f5f5;
 }
 
 .selectize-dropdown .active.create {
-  color: #ffffff;
+  color: #262626;
 }
 
 .selectize-dropdown .create {

diff --git a/vendor/assets/stylesheets/selectize.css b/vendor/assets/stylesheets/selectize.css
@@ -1,5 +1,5 @@
 /**
- * selectize.css (v0.8.4)
+ * selectize.css (v0.8.5)
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

diff --git a/vendor/assets/stylesheets/selectize.default.css b/vendor/assets/stylesheets/selectize.default.css
@@ -1,5 +1,5 @@
 /**
- * selectize.default.css (v0.8.4) - Default Theme
+ * selectize.default.css (v0.8.5) - Default Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this

diff --git a/vendor/assets/stylesheets/selectize.legacy.css b/vendor/assets/stylesheets/selectize.legacy.css
@@ -1,5 +1,5 @@
 /**
- * selectize.legacy.css (v0.8.4) - Default Theme
+ * selectize.legacy.css (v0.8.5) - Default Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this