Revert "Update the ui.selectable.js to dev r3202"

This reverts commit 3f4868aac5d5248d3cd5721601c737bf646f3fc1.

1 files changed, 73 insertions, 225 deletions

diff --git a/lib/jquery-ui.js b/lib/jquery-ui.js
index 8777e4fe..4939d009 100644
--- a/lib/jquery-ui.js
+++ b/lib/jquery-ui.js
@@ -159,41 +159,30 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			var self = this;
 			this.items = $(this.options.filter, this.element);
-			this.element.addClass("ui-selectable ui-widget");
+			this.element.addClass("ui-selectable");
 
 			//Set the currentFocus to the first item
-			this.currentFocus = this.items.eq(0).attr('tabindex', 0);
+			this.currentFocus = this.items.eq(0);
 			
 			//Refresh item positions
-			this.refresh(1);
+			this.refresh();
 
 			//Disable text selection
 			this.element.disableSelection();
 
 			//Prepare caret selection
-			if(this.options.lasso) {
-				
-				// we need to move the lasso options onto the root options for the mouse clas
-				if(this.options.lasso !== true) {
-					$.extend(this.options, this.options.lasso);
-				}
-				
-				this._mouseInit();
-			}
+			if(this.options.lasso) this._mouseInit();
 
 			this.element
 				.bind('mousedown.selectable', function(event) {
 
-					if(self.options.disabled)
-						return;
-
 					var item = self._targetIsItem(event.target);
 					if (!item) return;
-				
+					
 					// If item is part of current selection and current
 				    // selection is multiple, return and allow mouseup
 				    // to fire (Windows gets this right too, OSX doesn't)
-				    if(self._selection.length > 1 && $(item).hasClass('ui-selected')) {
+				    if(self._selection.length > 1 && $(item).hasClass(self.options.selectedClass)) {
 				    	return (self._listenForMouseUp = 1);
 				    }
 					
@@ -221,36 +210,36 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 					}
 				})
 				.bind('focus.selectable', function() {
-					if(!self.options.disabled) self.currentFocus.addClass('ui-state-focus');
+					self.currentFocus.addClass('ui-focused');
 				})
 				.bind('blur.selectable', function() {
-					if(!self.options.disabled) self.currentFocus.removeClass('ui-state-focus');
+					self.currentFocus.removeClass('ui-focused');
 				})
 				.bind('keydown.selectable', function(event) {
 
-					if(!self.options.keyboard || self.options.disabled)
+					if(!self.options.keyboard)
 						return;
 						
 					if(self._trigger('beforeselect', event) === false)
 						return true;
 					
 					if(event.keyCode == $.ui.keyCode.DOWN) {
-						self.options.closest ? self.selectClosest('down', event) : self.next(event);
+						self.options.smart ? self.selectClosest('down', event) : self.selectNext(event);
 						event.preventDefault();
 					}
 					
 					if(event.keyCode == $.ui.keyCode.RIGHT) {
-						self.options.closest ? self.selectClosest('right', event) : self.next(event);
+						self.options.smart ? self.selectClosest('right', event) : self.selectNext(event);
 						event.preventDefault();
 					}
 					
 					if(event.keyCode == $.ui.keyCode.UP) {
-						self.options.closest ? self.selectClosest('up', event) : self.previous(event);
+						self.options.smart ? self.selectClosest('up', event) : self.selectPrevious(event);
 						event.preventDefault();
 					}
 					
 					if(event.keyCode == $.ui.keyCode.LEFT) {
-						self.options.closest ? self.selectClosest('left', event) : self.previous(event);
+						self.options.smart ? self.selectClosest('left', event) : self.selectPrevious(event);
 						event.preventDefault();
 					}
 
@@ -271,7 +260,7 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 				overlap = 10000,
 				selfOffset = this.currentFocus.data('selectable-item');
 
-			this.items.not(this.currentFocus).filter(':visible').each(function() {
+			$(this.options.filter, this.element).not(this.currentFocus).filter(':visible').each(function() {
 
 				var $this = $(this),
 					offset = $this.data('selectable-item'),
@@ -314,23 +303,13 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			});
 			
-			// if nothing close is found, bail
-			if(!current[1])
-				return false;
-			
-			//We need to find the index of the current, and the index of the new one to call selectAdjacent
-			// - calling _select doesn't work, since it's only for mouse interaction (no ctrl focus move!)
-			var currentIndex = this.items.index(this.currentFocus[0]);
-			var newIndex = this.items.index(current[1]);
-			
-			return this._selectAdjacent(event, newIndex - currentIndex);
+			return current[1] ? this._select(event, current[1]) : false;
 			
 		},
 
 		destroy: function() {
-			this.items.removeClass("ui-selectable-item ui-selected ui-state-active");
 			this.element
-				.removeClass("ui-selectable ui-selectable-disabled ui-widget")
+				.removeClass("ui-selectable ui-selectable-disabled")
 				.removeData("selectable")
 				.unbind(".selectable");
 			this._mouseDestroy();
@@ -339,11 +318,11 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 		_mouseCapture: function(event) {
 			//If the item we start dragging on is a selectable, we bail (if keyboard is used)
 			this.clickedOnItem = this._targetIsItem(event.target);
-			return true; // TODO: this starts the lasso on items as well - we might want to introduce an option to disable this
+			return !this.options.keyboard || !this.clickedOnItem;
 		},
 		
 		_mouseStart: function(event) {
-
+			
 			var self = this, o = this.options;
 			this.opos = [event.pageX, event.pageY];
 	
@@ -351,13 +330,10 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 				return;
 	
 			//Cache positions
-			this.refresh(1);
+			this.refresh();
 	
 			//Trigger start event
 			this._trigger("start", event, this._uiHash());
-			
-			//Save the current selection as previous
-			this._previousSelection = this._selection.slice();
 	
 			// append and position helper (lasso)
 			$('body').append(this.helper);
@@ -371,12 +347,12 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 			});
 
 			//Tell the intersection that some start selected
-			for (var i = this._selection.length - 1; i >= 0; i--){
-				if(event.metaKey || event.ctrlKey) {
-					if(this != self.clickedOnItem) $(this._selection[i]).data("selectable-item").startSelected = true;
-				} else self._removeFromSelection($(this._selection[i]), event);
-			};
-			
+			this.items.filter('.'+this.options.selectedClass).each(function() {
+				if(event.metaKey) {
+					if(this != self.clickedOnItem) $.data(this, "selectable-item").startSelected = true;
+				} else self._removeFromSelection($(this), event);
+			});
+				
 		},
 		
 		_mouseDrag: function(event) {
@@ -419,41 +395,7 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 		},
 	
 		_mouseStop: function(event) {
-			
-			var newlySelected = [],
-				newlyDeselected = [];
-			
-			// Find out the delta of the newly selected items
-			for (var i=0; i < this._selection.length; i++) {
-				var wasAlreadyPartOfPreviousSelection = false;
-				for (var j=0; j < this._previousSelection.length; j++) {
-					if(this._selection[i][0] == this._previousSelection[j][0])
-						wasAlreadyPartOfPreviousSelection = true;
-				};
-				if(!wasAlreadyPartOfPreviousSelection) newlySelected.push(this._selection[i]);
-			};
-
-			// Find out the delta of the newly unselected items
-			for (var i = this._previousSelection.length - 1; i >= 0; i--){
-				if(!this._previousSelection[i].data('selectable-item').selected) newlyDeselected.push(this._previousSelection[i]);
-			};
-			
-			
-			// Transform both deltas into jQuery objects
-			newlySelected = $($.map(newlySelected, function(i) { return i[0]; }));
-			newlyDeselected = $($.map(newlyDeselected, function(i) { return i[0]; }));
-
-			var uiHash = $.extend(this._uiHash(), {
-				added: newlySelected || [],
-				removed: newlyDeselected || []
-			});
-			this._trigger("stop", event, uiHash);
-			
-			// Trigger change event if anything has changed
-			if((newlySelected && newlySelected.length) || (newlyDeselected && newlyDeselected.length)) {
-				this._trigger('change', event, uiHash);
-			}
-			
+			this._trigger("stop", event, this._uiHash());
 			this.helper.remove();
 			return false;
 		},	
@@ -465,63 +407,23 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 		_selection: [],
 
-		_endSelection: function(event, newlySelected) {
-
-			//Only trigger the 'deselect' event if items have been removed from the selection
-			var newlyDeselected = this._triggerDeselection(event);
-
-			//Only trigger 'select' event if items have been added to the selection
-			if(newlySelected && newlySelected.length)
-				this._trigger('select', event, this._uiHash(newlySelected, 'added'));
-			
-			// Trigger change event if anything has changed
-			if((newlySelected && newlySelected.length) || (newlyDeselected && newlyDeselected.length)) {
-				var uiHash = $.extend(this._uiHash(), {
-					added: newlySelected || [],
-					removed: newlyDeselected || []
-				});
-				this._trigger('change', event, uiHash);
-			}
-			
-		},
-
-		_triggerDeselection: function(event) {
-			
-			var triggerItems = [];
-
-			for (var i = this._previousSelection.length - 1; i >= 0; i--){
-				var data = this._previousSelection[i].data('selectable-item');
-				if(!data || !data.selected) triggerItems.push(this._previousSelection[i]);
-			};
-
-			this._previousSelection = [];
-			triggerItems = $($.map(triggerItems, function(i) { return i[0]; }));
-			if(triggerItems.length) this._trigger('deselect', event, this._uiHash(triggerItems, 'removed'));
-			
-			return triggerItems;
-
-		},
-
 		_clearSelection: function(triggerEvent) {
 
 			var triggerItems = [];
 
 			for (var i = this._selection.length - 1; i >= 0; i--){
 				if(triggerEvent && this._selection[i].data('selectable-item').selected) triggerItems.push(this._selection[i]);
-				this._selection[i].removeClass('ui-selected ui-state-active');
+				this._selection[i].removeClass(this.options.selectedClass);
 				this._selection[i].data('selectable-item').selected = false;
 			};
 
-			this._previousSelection = this._selection.slice();
 			this._selection = [];
-			if(triggerEvent && triggerItems.length) this._trigger('deselect', triggerEvent, this._uiHash($($.map(triggerItems, function(i) { return i[0]; })), 'removed'));
+			if(triggerEvent) this._trigger('unselect', triggerEvent, this._uiHash($($.map(triggerItems, function(i) { return i[0]; })), 'removed'));
 
 		},
 
 		_toggleSelection: function(item, event) {
-			var selected = item.data('selectable-item').selected;
-			selected ? this._removeFromSelection(item, event) : this._addToSelection(item);
-			return !selected;
+				item.data('selectable-item').selected ? this._removeFromSelection(item, event) : this._addToSelection(item);
 		},
 
 		_addToSelection: function(item, triggerEvent) {
@@ -531,7 +433,7 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			this._selection.push(item);
 			this.latestSelection = item;
-			item.addClass('ui-selected ui-state-active');
+			item.addClass(this.options.selectedClass);
 			item.data('selectable-item').selected = true;
 			
 			if(triggerEvent) {
@@ -546,10 +448,10 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			for (var i=0; i < this._selection.length; i++) {
 				if (this._selection[i][0] == item[0]) {
-					this._selection[i].removeClass('ui-selected ui-state-active');
+					this._selection[i].removeClass(this.options.selectedClass);
 					this._selection[i].data('selectable-item').selected = false;
 					this._selection.splice(i,1);
-					if(triggerEvent) this._trigger('deselect', triggerEvent, this._uiHash($(item), 'removed'));
+					if(triggerEvent) this._trigger('unselect', triggerEvent, this._uiHash($(item), 'removed'));
 					break;
 				}
 			};
@@ -560,10 +462,10 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			var newlySelected = [];
 
-			if (event && event.shiftKey) {
+			if (event.shiftKey && this.options.multiple) {
 
 				//Clear the previous selection to make room for a shift selection
-				this._clearSelection();
+				this._clearSelection(event);
 
 				var index = this.items.index(this.latestWithoutModifier[0]) > this.items.index(this.currentFocus[0]) ? -1 : 1;
 				var i = this.latestWithoutModifier.data('selectable-item').selected ? this.items.eq(this.items.index(this.latestWithoutModifier[0])+index) : this.latestWithoutModifier;
@@ -577,11 +479,10 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			} else {
 
-				if (event && (event.metaKey || event.ctrlKey)) {
-					var withMetaIsNewlySelected = this._toggleSelection(this.currentFocus, event);
-					if(withMetaIsNewlySelected) newlySelected.push(this.currentFocus);
+				if (event.metaKey) {
+					this._toggleSelection(this.currentFocus, event);
 				} else {
-					this._clearSelection();
+					this._clearSelection(event);
 					newlySelected.push(this._addToSelection(this.currentFocus));
 					this.latestWithoutModifier = this.currentFocus;
 				}
@@ -596,7 +497,7 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			var newlySelected = [];
 
-			if (event && event.shiftKey) {
+			if (event.shiftKey && this.options.multiple) {
 
 				if (this.currentFocus.data('selectable-item').selected) {
 					this._removeFromSelection(this.previousFocus, event);
@@ -618,7 +519,7 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 			} else {
 
 				//If the CTRL or Apple/Win key is pressed, only set focus
-				if (event && (event.metaKey || event.ctrlKey))
+				if (event.metaKey)
 					return;
 
 				this._clearSelection(event);
@@ -627,24 +528,24 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 			}
 			
-			return $($.map(newlySelected, function(i) { if(i) return i[0]; }));
+			return $($.map(newlySelected, function(i) { return i[0]; }));
 
 		},
 
 		_select: function(event, item) {
 
 			//Set the current selection to the previous/next item
-			this.previousFocus = this.currentFocus.attr('tabindex', -1);
-			this.currentFocus = $(item).attr('tabindex', 0);
+			this.previousFocus = this.currentFocus;
+			this.currentFocus = $(item);
 
-			this.previousFocus.removeClass('ui-state-focus');
-			this.currentFocus.addClass('ui-state-focus');
+			this.previousFocus.removeClass('ui-focused');
+			this.currentFocus.addClass('ui-focused');
 
 			//Set and update the selection
 			var newlySelected = this._updateSelectionMouse(event);
 
-			// Ending the selection does a diff and then triggers appropriate events
-			this._endSelection(event, newlySelected);
+			//Trigger select event
+			if(newlySelected && newlySelected.length) this._trigger('select', event, this._uiHash(newlySelected, 'added'));
 
 		},
 
@@ -656,118 +557,54 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 			if (!item.length) return;
 
 			//Set the current selection to the previous/next item
-			this.previousFocus = this.currentFocus.attr('tabindex', -1);
-			this.currentFocus = item.attr('tabindex', 0);
+			this.previousFocus = this.currentFocus;
+			this.currentFocus = item;
 
-			this.previousFocus.removeClass('ui-state-focus');
-			this.currentFocus.addClass('ui-state-focus');
+			this.previousFocus.removeClass('ui-focused');
+			this.currentFocus.addClass('ui-focused');
 
 			//Set and update the selection
-			this._previousSelection = this._selection.slice();
 			var newlySelected = this._updateSelection(event, index);
 
-			// Ending the selection does a diff and then triggers appropriate events
-			this._endSelection(event, newlySelected);
+			//Trigger select event
+			if(newlySelected && newlySelected.length) this._trigger('select', event, this._uiHash(newlySelected, 'added'));
 
 		},
 
-		previous: function(event) {
+		selectPrevious: function(event) {
 			this._selectAdjacent(event, -1);
 		},
 
-		next: function(event) {
+		selectNext: function(event) {
 			this._selectAdjacent(event, 1);
 		},
 		
-		refresh: function(fromInside) {
+		refresh: function() {
 
-			var o = this.options, self = this;
+			var o = this.options;
 			this.items = $(o.filter, this.element);
-			this.items.addClass('ui-selectable-item');
 			this.items.each(function() {
-				
 				var $this = $(this);
 				var pos = $this.offset();
-				
-				if(self.currentFocus && self.currentFocus[0] != this)
-					$this.attr('tabindex', -1);
-					
 				$.data(this, "selectable-item", {
 					left: pos.left,
 					top: pos.top,
 					right: pos.left + $this.width(),
 					bottom: pos.top + $this.height(),
 					startSelected: false,
-					selected: $this.hasClass('ui-selected')
+					selected: $this.hasClass(o.selectedClass)
 				});
 			});
-			
-			
-			if(!fromInside) {
-				this._previousSelection = this._selection.slice();
-				this._selection = [];
-				for (var i=0; i < this._previousSelection.length; i++) {
-					if(this._previousSelection[i][0].parentNode) this._selection.push(this._previousSelection[i]);
-				};
-
-				this._endSelection();
-			}
-
 
 		},
 		
 		select: function(item) {
-
-			if(!isNaN(parseInt(item)))
-				item = this.items.get(item);
-			
-			item = $(item, this.element);
-			if(!item.length) return;
-
-			// clear the current selection
-			this._clearSelection();
-			
-			// select all found
-			var newlySelected = [], self = this;
-			item.each(function(i) {
-				if(i == 0) { //Setting the focus on the first item in the list
-					self.previousFocus = self.currentFocus.attr('tabindex', -1);
-					self.currentFocus = $(this).attr('tabindex', 0);
-					self.previousFocus.removeClass('ui-state-focus');
-					self.currentFocus.addClass('ui-state-focus');
-				}
-				newlySelected.push(self._addToSelection($(this)));
-			});
-			
-			// Ending the selection does a diff and then triggers appropriate events
-			this._endSelection(event, $($.map(newlySelected, function(i) { return i[0]; })));
-			
+			//TODO
 		},
 		
 		deselect: function(item) {
-			
-			// if no item was specified, deselect all
-			if(!item)
-				this._clearSelection(true);
-
-			if(!isNaN(parseInt(item)))
-				item = this.items.get(item);
-			
-			item = $(item, this.element);
-			if(!item.length) return;
-
-			//store the current selection
-			this._previousSelection = this._selection.slice();
-			
-			// deselect all found
-			var self = this;
-			item.each(function() {
-				self._removeFromSelection($(this));
-			});
-			
-			// Ending the selection does a diff and then triggers appropriate events
-			this._endSelection(event);
-
+			if(!item) this._clearSelection(true);
+			//TODO: Deselect single elements
 		},
 
 		_uiHash: function(items, specialKey) {
@@ -784,7 +621,15 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 
 	$.extend($.ui.selectable, {
 		defaults: {
-			closest: true,
+
+			//TODO: Figure out how to move these defaults out
+			cancel: ":input,option",
+			delay: 0,
+			distance: 1,
+			appendTo: 'body',
+
+			multiple: true,
+			smart: true,
 			filter: '> *',
 			
 			keyboard: true,
@@ -794,7 +639,10 @@ jQuery.effects||(function(d){d.effects={version:"1.7.2",save:function(g,h){for(v
 				distance: 1,
 				tolerance: 'touch',
 				appendTo: 'body'
-			}
+			},
+			
+			//Should we really delete that?
+			selectedClass: 'ui-state-selected'
 		}
 	});