Merge master into 0.8.

Author: brianreavis

bower.json

@@ -2,7 +2,7 @@
 	"name": "selectize",
 	"keywords": ["select", "ui", "form", "input", "control", "autocomplete", "tagging", "tag"],
 	"description": "Selectize is a jQuery-based custom <select> UI control. Useful for tagging, contact lists, country selectors, etc.",
-	"version": "0.7.5",
+	"version": "0.7.7",
 	"license": "Apache License, Version 2.0",
 	"readmeFilename": "README.md",
 	"repository": {

dist/css/selectize.bootstrap2.css

@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap2.css (v0.7.5) - 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

dist/css/selectize.bootstrap3.css

@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap3.css (v0.7.5) - 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

dist/css/selectize.css

@@ -1,5 +1,5 @@
 /**
- * selectize.css (v0.7.5)
+ * 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

dist/css/selectize.default.css

@@ -1,5 +1,5 @@
 /**
- * selectize.default.css (v0.7.5) - 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

dist/css/selectize.legacy.css

@@ -1,5 +1,5 @@
 /**
- * selectize.legacy.css (v0.7.5) - 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

dist/js/selectize.js

@@ -1,5 +1,5 @@
 /**
- * selectize.js (v0.7.5)
+ * 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
@@ -157,17 +157,6 @@
 			.replace(/"/g, '"');
 	};
 
-	/**
-	 * 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 = {};
 
 	/**
@@ -1427,7 +1416,7 @@
 		 */
 		addOptionGroup: function(id, data) {
 			this.optgroups[id] = data;
-			this.trigger('optgroup_add', value, data);
+			this.trigger('optgroup_add', id, data);
 		},
 
 		/**
@@ -1525,8 +1514,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]'));
 		},
 
 		/**
@@ -1544,6 +1532,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.
@@ -1552,7 +1562,7 @@
 		 * @returns {object}
 		 */
 		getItem: function(value) {
-			return this.$control.children('[data-value="' + escape_quotes(hash_key(value)) + '"]');
+			return this.getElementWithValue(value, this.$control.children());
 		},
 
 		/**
@@ -2161,7 +2171,7 @@
 
 		dataAttr: 'data-data',
 		optgroupField: 'optgroup',
-		sortField: null,
+		sortField: '$order',
 		sortDirection: 'asc',
 		valueField: 'value',
 		labelField: 'text',
@@ -2242,6 +2252,7 @@
 		var init_select = function($input, settings_element) {
 			var i, n, tagName;
 			var $children;
+			var order = 0;
 			settings_element.maxItems = !!$input.attr('multiple') ? null : 1;
 
 			var readData = function($el) {
@@ -2253,16 +2264,22 @@
 			};
 
 			var addOption = function($option, group) {
+				var value, option;
+	
 				$option = $($option);
 
-				var value = $option.attr('value') || '';
+				value = $option.attr('value') || '';
 				if (!value.length) return;
 
-				settings_element.options[value] = readData($option) || {
+				option = readData($option) || {
 					'text'     : $option.text(),
 					'value'    : value,
 					'optgroup' : group
 				};
+	
+				option.$order = ++order;
+				settings_element.options[value] = option;
+	
 				if ($option.is(':selected')) {
 					settings_element.items.push(value);
 				}

dist/js/selectize.min.js

@@ -258,11 +258,7 @@
 					var field = options.sort;
 					var multiplier = options.direction === 'desc' ? -1 : 1;
 					return function(a, b) {
-						a = a && String(self.items[a.id][field] || '').toLowerCase();
-						b = b && String(self.items[b.id][field] || '').toLowerCase();
-						if (a > b) return 1 * multiplier;
-						if (b > a) return -1 * multiplier;
-						return 0;
+						return cmp(self.items[a.id][field], self.items[b.id][field]) * multiplier;
 					};
 				})());
 			}
@@ -280,6 +276,17 @@
 	// utilities
 	// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 
+	var cmp = function(a, b) {
+		if (typeof a === 'number' && typeof b === 'number') {
+			return a > b ? 1 : (a < b ? -1 : 0);
+		}
+		a = String(a || '').toLowerCase();
+		b = String(b || '').toLowerCase();
+		if (a > b) return 1;
+		if (b > a) return -1;
+		return 0;
+	};
+
 	var extend = function(a, b) {
 		var i, n, k, object;
 		for (i = 1, n = arguments.length; i < n; i++) {
@@ -454,7 +461,7 @@
 	};
 
 	var utils = {
-		isArray: Array.isArray || function() {
+		isArray: Array.isArray || function(vArg) {
 			return Object.prototype.toString.call(vArg) === '[object Array]';
 		}
 	};
@@ -463,7 +470,7 @@
 }));
 
 /**
- * selectize.js (v0.7.5)
+ * 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
@@ -621,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 = {};
 
 	/**
@@ -1893,7 +1889,7 @@
 		 */
 		addOptionGroup: function(id, data) {
 			this.optgroups[id] = data;
-			this.trigger('optgroup_add', value, data);
+			this.trigger('optgroup_add', id, data);
 		},
 
 		/**
@@ -1991,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]'));
 		},
 
 		/**
@@ -2010,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.
@@ -2018,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());
 		},
 
 		/**
@@ -2627,7 +2644,7 @@
 
 		dataAttr: 'data-data',
 		optgroupField: 'optgroup',
-		sortField: null,
+		sortField: '$order',
 		sortDirection: 'asc',
 		valueField: 'value',
 		labelField: 'text',
@@ -2708,6 +2725,7 @@
 		var init_select = function($input, settings_element) {
 			var i, n, tagName;
 			var $children;
+			var order = 0;
 			settings_element.maxItems = !!$input.attr('multiple') ? null : 1;
 
 			var readData = function($el) {
@@ -2719,16 +2737,22 @@
 			};
 
 			var addOption = function($option, group) {
+				var value, option;
+	
 				$option = $($option);
 
-				var value = $option.attr('value') || '';
+				value = $option.attr('value') || '';
 				if (!value.length) return;
 
-				settings_element.options[value] = readData($option) || {
+				option = readData($option) || {
 					'text'     : $option.text(),
 					'value'    : value,
 					'optgroup' : group
 				};
+	
+				option.$order = ++order;
+				settings_element.options[value] = option;
+	
 				if ($option.is(':selected')) {
 					settings_element.items.push(value);
 				}

dist/js/standalone/selectize.js

@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap2.css (v0.7.5) - 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

dist/js/standalone/selectize.min.js

@@ -1,5 +1,5 @@
 /**
- * selectize.bootstrap3.css (v0.7.5) - 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

dist/less/selectize.bootstrap2.less

@@ -1,5 +1,5 @@
 /**
- * selectize.default.css (v0.7.5) - 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

dist/less/selectize.bootstrap3.less

@@ -1,5 +1,5 @@
 /**
- * selectize.legacy.css (v0.7.5) - 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

dist/less/selectize.default.less

@@ -2,7 +2,7 @@
 	"name": "selectize",
 	"keywords": ["select", "ui", "form", "input", "control", "autocomplete", "tagging", "tag"],
 	"description": "Selectize is a jQuery-based custom <select> UI control. Useful for tagging, contact lists, country selectors, etc.",
-	"version": "0.7.5",
+	"version": "0.7.7",
 	"author": "Brian Reavis <[email protected]>",
 	"repository": {
 		"type": "git",

dist/less/selectize.legacy.less

@@ -1,6 +1,6 @@
 {
 	"name": "selectize",
-	"version": "0.7.5",
+	"version": "0.7.7",
 	"title": "Selectize.js",
 	"author": {
 		"name": "Brian Reavis",