Released 0.6.7.

aag-peace · Jul 29, 2013 · d7eab47 · d7eab47
1 parent c4e10c9
commit d7eab47
Show file tree

Hide file tree

Showing 5 changed files with 74 additions and 54 deletions.
diff --git a/bower.json b/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.6.6",
+	"version": "0.6.7",
 	"license": "Apache License, Version 2.0",
 	"readmeFilename": "README.md",
 	"repository": {

diff --git a/selectize.css b/selectize.css
@@ -1,4 +1,4 @@
-/*! selectize.css - v0.6.6 | https://github.com/brianreavis/selectize.js | Apache License (v2) */
+/*! selectize.css - v0.6.7 | https://github.com/brianreavis/selectize.js | Apache License (v2) */
 
 /* --- file: "src/selectize.css" --- */
 

diff --git a/selectize.jquery.json b/selectize.jquery.json
@@ -1,6 +1,6 @@
 {
 	"name": "selectize",
-	"version": "0.6.6",
+	"version": "0.6.7",
 	"title": "Selectize.js",
 	"author": {
 		"name": "Brian Reavis",

diff --git a/selectize.js b/selectize.js
@@ -1,4 +1,4 @@
-/*! selectize.js - v0.6.6 | https://github.com/brianreavis/selectize.js | Apache License (v2) */
+/*! selectize.js - v0.6.7 | https://github.com/brianreavis/selectize.js | Apache License (v2) */
 
 (function(factory) {
 	if (typeof exports === 'object') {
@@ -1030,18 +1030,23 @@
 		 * @returns {boolean}
 		 */
 		onOptionSelect: function(e) {
+			var value, $target, $option, self = this;
+
 			e.preventDefault && e.preventDefault();
 			e.stopPropagation && e.stopPropagation();
-			this.focus(false);
+			self.focus(false);
 
-			var $target = $(e.currentTarget);
+			$target = $(e.currentTarget);
 			if ($target.hasClass('create')) {
-				this.createItem();
+				self.createItem();
 			} else {
-				var value = $target.attr('data-value');
+				value = $target.attr('data-value');
 				if (value) {
-					this.setTextboxValue('');
-					this.addItem(value);
+					self.setTextboxValue('');
+					self.addItem(value);
+					if (!self.settings.hideSelected && e.type && /mouse/.test(e.type)) {
+						self.setActiveOption(self.getOption(value));
+					}
 				}
 			}
 		},
@@ -1799,8 +1804,9 @@
 				self.refreshClasses();
 
 				if (self.isSetup) {
-					// remove the option from the menu
 					options = self.$dropdown_content.find('[data-selectable]');
+
+					// update menu / remove the option
 					$option = self.getOption(value);
 					value_next = self.getAdjacentOption($option, 1).attr('data-value');
 					self.refreshOptions(true);
@@ -2088,12 +2094,16 @@
 		 * @returns {boolean}
 		 */
 		deleteSelection: function(e) {
-			var i, n, direction, selection, values, caret, $tail;
+			var i, n, direction, selection, values, caret, option_select, $option_select, $tail;
 			var self = this;
 
 			direction = (e && e.keyCode === KEY_BACKSPACE) ? -1 : 1;
 			selection = getSelection(self.$control_input[0]);
 
+			if (self.$activeOption && !self.settings.hideSelected) {
+				option_select = self.getAdjacentOption(self.$activeOption, -1).attr('data-value');
+			}
+
 			// determine items that will be removed
 			values = [];
 
@@ -2132,6 +2142,15 @@
 
 			self.showInput();
 			self.refreshOptions(true);
+
+			// select previous option
+			if (option_select) {
+				$option_select = self.getOption(option_select);
+				if ($option_select.length) {
+					self.setActiveOption($option_select);
+				}
+			}
+
 			return true;
 		},