release 0.7.7

manuelvanrijn · Sep 16, 2013 · 4f57968 · 4f57968
1 parent 6f9e37a
commit 4f57968
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 22 deletions.
diff --git a/README.md b/README.md
@@ -41,6 +41,7 @@ See the [demo page of Brian Reavis](http://brianreavis.github.io/selectize.js/)
 
 | Version | Notes                                                       |
 | -------:| ----------------------------------------------------------- |
+|   0.7.7 | Update to v0.7.7 of selectize.js                            |
 |   0.7.6 | Update to v0.7.6 of selectize.js                            |
 |   0.7.5 | Update to v0.7.5 of selectize.js                            |
 |   0.7.4 | Update to v0.7.4 of selectize.js                            |

diff --git a/lib/selectize-rails/version.rb b/lib/selectize-rails/version.rb
@@ -1,5 +1,5 @@
 module Selectize
   module Rails
-    VERSION = "0.7.6"
+    VERSION = "0.7.7"
   end
 end
diff --git a/vendor/assets/javascripts/selectize.js b/vendor/assets/javascripts/selectize.js
@@ -470,7 +470,7 @@
 }));
 
 /**
- * selectize.js (v0.7.6)
+ * selectize.js (v0.7.7)
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this
@@ -628,17 +628,6 @@
 			.replace(/"/g, '&quot;');
 	};
 
-	/**
-	 * Escapes quotation marks with backslashes. Useful
-	 * for escaping values for use in CSS attribute selectors.
-	 *
-	 * @param {string} str
-	 * @return {string}
-	 */
-	var escape_quotes = function(str) {
-		return str.replace(/(['"])/g, '\\$1');
-	};
-
 	var hook = {};
 
 	/**
@@ -1900,7 +1889,7 @@
 		 */
 		addOptionGroup: function(id, data) {
 			this.optgroups[id] = data;
-			this.trigger('optgroup_add', value, data);
+			this.trigger('optgroup_add', id, data);
 		},
 
 		/**
@@ -1998,8 +1987,7 @@
 		 * @returns {object}
 		 */
 		getOption: function(value) {
-			value = hash_key(value);
-			return value ? this.$dropdown_content.find('[data-selectable]').filter('[data-value="' + escape_quotes(value) + '"]:first') : $();
+			return this.getElementWithValue(value, this.$dropdown_content.find('[data-selectable]'));
 		},
 
 		/**
@@ -2017,6 +2005,28 @@
 			return index >= 0 && index < $options.length ? $options.eq(index) : $();
 		},
 
+		/**
+		 * Finds the first element with a "data-value" attribute
+		 * that matches the given value.
+		 *
+		 * @param {mixed} value
+		 * @param {object} $els
+		 * @return {object}
+		 */
+		getElementWithValue: function(value, $els) {
+			value = hash_key(value);
+
+			if (value) {
+				for (var i = 0, n = $els.length; i < n; i++) {
+					if ($els[i].getAttribute('data-value') === value) {
+						return $($els[i]);
+					}
+				}
+			}
+
+			return $();
+		},
+
 		/**
 		 * Returns the jQuery element of the item
 		 * matching the given value.
@@ -2025,7 +2035,7 @@
 		 * @returns {object}
 		 */
 		getItem: function(value) {
-			return this.$control.children('[data-value="' + escape_quotes(hash_key(value)) + '"]');
+			return this.getElementWithValue(value, this.$control.children());
 		},
 
 		/**

diff --git a/vendor/assets/stylesheets/selectize.bootstrap2.css b/vendor/assets/stylesheets/selectize.bootstrap2.css
@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap2.css (v0.7.6) - Bootstrap 2 Theme
+ * selectize.bootstrap2.css (v0.7.7) - 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.7.6) - Bootstrap 3 Theme
+ * selectize.bootstrap3.css (v0.7.7) - Bootstrap 3 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.css b/vendor/assets/stylesheets/selectize.css
@@ -1,5 +1,5 @@
 /**
- * selectize.css (v0.7.6)
+ * selectize.css (v0.7.7)
  * 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.7.6) - Default Theme
+ * selectize.default.css (v0.7.7) - 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.7.6) - Default Theme
+ * selectize.legacy.css (v0.7.7) - Default Theme
  * Copyright (c) 2013 Brian Reavis & contributors
  *
  * Licensed under the Apache License, Version 2.0 (the "License"); you may not use this