RubyGems - jquery-ui-rails - Versions diffs - 4.1.0 → 4.2.1 - Mend

jquery-ui-rails 4.1.0 → 4.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Potentially problematic release.

This version of jquery-ui-rails might be problematic. Click here for more details.

Files changed (65) hide show

data/app/assets/javascripts/jquery.ui.dialog.js CHANGED Viewed

@@ -6,10 +6,10 @@
 //= require jquery.ui.resizable
 /*!
- * jQuery UI Dialog 1.10.3
+ * jQuery UI Dialog 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -43,7 +43,7 @@ var sizeRelatedOptions = {
 	};
 $.widget( "ui.dialog", {
-	version: "1.10.3",
+	version: "1.10.4",
 	options: {
 		appendTo: "body",
 		autoOpen: true,
@@ -176,7 +176,8 @@ $.widget( "ui.dialog", {
 	enable: $.noop,
 	close: function( event ) {
-		var that = this;
+		var activeElement,
+			that = this;
 		if ( !this._isOpen || this._trigger( "beforeClose", event ) === false ) {
 			return;
@@ -186,10 +187,22 @@ $.widget( "ui.dialog", {
 		this._destroyOverlay();
 		if ( !this.opener.filter(":focusable").focus().length ) {
-			// Hiding a focused element doesn't trigger blur in WebKit
-			// so in case we have nothing to focus on, explicitly blur the active element
-			// https://bugs.webkit.org/show_bug.cgi?id=47182
-			$( this.document[0].activeElement ).blur();
+			// support: IE9
+			// IE9 throws an "Unspecified error" accessing document.activeElement from an <iframe>
+			try {
+				activeElement = this.document[ 0 ].activeElement;
+				// Support: IE9, IE10
+				// If the <body> is blurred, IE will switch windows, see #4520
+				if ( activeElement && activeElement.nodeName.toLowerCase() !== "body" ) {
+					// Hiding a focused element doesn't trigger blur in WebKit
+					// so in case we have nothing to focus on, explicitly blur the active element
+					// https://bugs.webkit.org/show_bug.cgi?id=47182
+					$( activeElement ).blur();
+				}
+			} catch ( error ) {}
 		}
 		this._hide( this.uiDialog, this.options.hide, function() {
@@ -349,7 +362,10 @@ $.widget( "ui.dialog", {
 			}
 		});
-		this.uiDialogTitlebarClose = $("<button></button>")
+		// support: IE
+		// Use type="button" to prevent enter keypresses in textboxes from closing the
+		// dialog in IE (#9312)
+		this.uiDialogTitlebarClose = $( "<button type='button'></button>" )
 			.button({
 				label: this.options.closeText,
 				icons: {
@@ -563,7 +579,6 @@ $.widget( "ui.dialog", {
 	},
 	_setOption: function( key, value ) {
-		/*jshint maxcomplexity:15*/
 		var isDraggable, isResizable,
 			uiDialog = this.uiDialog;

data/app/assets/javascripts/jquery.ui.draggable.js CHANGED Viewed

@@ -3,10 +3,10 @@
 //= require jquery.ui.mouse
 /*!
- * jQuery UI Draggable 1.10.3
+ * jQuery UI Draggable 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -20,7 +20,7 @@
 (function( $, undefined ) {
 $.widget("ui.draggable", $.ui.mouse, {
-	version: "1.10.3",
+	version: "1.10.4",
 	widgetEventPrefix: "drag",
 	options: {
 		addClasses: true,

data/app/assets/javascripts/jquery.ui.droppable.js CHANGED Viewed

@@ -4,10 +4,10 @@
 //= require jquery.ui.draggable
 /*!
- * jQuery UI Droppable 1.10.3
+ * jQuery UI Droppable 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -26,7 +26,7 @@ function isOverAxis( x, reference, size ) {
 }
 $.widget("ui.droppable", {
-	version: "1.10.3",
+	version: "1.10.4",
 	widgetEventPrefix: "drop",
 	options: {
 		accept: "*",
@@ -46,7 +46,8 @@ $.widget("ui.droppable", {
 	},
 	_create: function() {
-		var o = this.options,
+		var proportions,
+			o = this.options,
 			accept = o.accept;
 		this.isover = false;
@@ -56,8 +57,20 @@ $.widget("ui.droppable", {
 			return d.is(accept);
 		};
-		//Store the droppable's proportions
-		this.proportions = { width: this.element[0].offsetWidth, height: this.element[0].offsetHeight };
+		this.proportions = function( /* valueToWrite */ ) {
+			if ( arguments.length ) {
+				// Store the droppable's proportions
+				proportions = arguments[ 0 ];
+			} else {
+				// Retrieve or derive the droppable's proportions
+				return proportions ?
+					proportions :
+					proportions = {
+						width: this.element[ 0 ].offsetWidth,
+						height: this.element[ 0 ].offsetHeight
+					};
+			}
+		};
 		// Add the reference and positions to the manager
 		$.ui.ddmanager.droppables[o.scope] = $.ui.ddmanager.droppables[o.scope] || [];
@@ -203,10 +216,14 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
 	}
 	var draggableLeft, draggableTop,
-		x1 = (draggable.positionAbs || draggable.position.absolute).left, x2 = x1 + draggable.helperProportions.width,
-		y1 = (draggable.positionAbs || draggable.position.absolute).top, y2 = y1 + draggable.helperProportions.height,
-		l = droppable.offset.left, r = l + droppable.proportions.width,
-		t = droppable.offset.top, b = t + droppable.proportions.height;
+		x1 = (draggable.positionAbs || draggable.position.absolute).left,
+		y1 = (draggable.positionAbs || draggable.position.absolute).top,
+		x2 = x1 + draggable.helperProportions.width,
+		y2 = y1 + draggable.helperProportions.height,
+		l = droppable.offset.left,
+		t = droppable.offset.top,
+		r = l + droppable.proportions().width,
+		b = t + droppable.proportions().height;
 	switch (toleranceMode) {
 		case "fit":
@@ -219,7 +236,7 @@ $.ui.intersect = function(draggable, droppable, toleranceMode) {
 		case "pointer":
 			draggableLeft = ((draggable.positionAbs || draggable.position.absolute).left + (draggable.clickOffset || draggable.offset.click).left);
 			draggableTop = ((draggable.positionAbs || draggable.position.absolute).top + (draggable.clickOffset || draggable.offset.click).top);
-			return isOverAxis( draggableTop, t, droppable.proportions.height ) && isOverAxis( draggableLeft, l, droppable.proportions.width );
+			return isOverAxis( draggableTop, t, droppable.proportions().height ) && isOverAxis( draggableLeft, l, droppable.proportions().width );
 		case "touch":
 			return (
 				(y1 >= t && y1 <= b) ||	// Top edge touching
@@ -259,7 +276,7 @@ $.ui.ddmanager = {
 			// Filter out elements in the current dragged item
 			for (j=0; j < list.length; j++) {
 				if(list[j] === m[i].element[0]) {
-					m[i].proportions.height = 0;
+					m[i].proportions().height = 0;
 					continue droppablesLoop;
 				}
 			}
@@ -274,8 +291,8 @@ $.ui.ddmanager = {
 				m[i]._activate.call(m[i], event);
 			}
-			m[i].offset = m[i].element.offset();
-			m[i].proportions = { width: m[i].element[0].offsetWidth, height: m[i].element[0].offsetHeight };
+			m[ i ].offset = m[ i ].element.offset();
+			m[ i ].proportions({ width: m[ i ].element[ 0 ].offsetWidth, height: m[ i ].element[ 0 ].offsetHeight });
 		}

data/app/assets/javascripts/jquery.ui.effect-blind.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Blind 1.10.3
+ * jQuery UI Effects Blind 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-bounce.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Bounce 1.10.3
+ * jQuery UI Effects Bounce 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-clip.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Clip 1.10.3
+ * jQuery UI Effects Clip 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-drop.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Drop 1.10.3
+ * jQuery UI Effects Drop 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-explode.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Explode 1.10.3
+ * jQuery UI Effects Explode 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-fade.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Fade 1.10.3
+ * jQuery UI Effects Fade 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-fold.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Fold 1.10.3
+ * jQuery UI Effects Fold 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-highlight.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Highlight 1.10.3
+ * jQuery UI Effects Highlight 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-pulsate.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Pulsate 1.10.3
+ * jQuery UI Effects Pulsate 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-scale.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Scale 1.10.3
+ * jQuery UI Effects Scale 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-shake.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Shake 1.10.3
+ * jQuery UI Effects Shake 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-slide.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Slide 1.10.3
+ * jQuery UI Effects Slide 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect-transfer.js CHANGED Viewed

@@ -1,10 +1,10 @@
 //= require jquery.ui.effect
 /*!
- * jQuery UI Effects Transfer 1.10.3
+ * jQuery UI Effects Transfer 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *

data/app/assets/javascripts/jquery.ui.effect.js CHANGED Viewed

@@ -1,8 +1,8 @@
 /*!
- * jQuery UI Effects 1.10.3
+ * jQuery UI Effects 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -893,7 +893,7 @@ $.fn.extend({
 (function() {
 $.extend( $.effects, {
-	version: "1.10.3",
+	version: "1.10.4",
 	// Saves a set of properties in a data storage
 	save: function( element, set ) {

data/app/assets/javascripts/jquery.ui.menu.js CHANGED Viewed

@@ -3,10 +3,10 @@
 //= require jquery.ui.position
 /*!
- * jQuery UI Menu 1.10.3
+ * jQuery UI Menu 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -20,7 +20,7 @@
 (function( $, undefined ) {
 $.widget( "ui.menu", {
-	version: "1.10.3",
+	version: "1.10.4",
 	defaultElement: "<ul>",
 	delay: 300,
 	options: {
@@ -79,13 +79,18 @@ $.widget( "ui.menu", {
 			"click .ui-menu-item:has(a)": function( event ) {
 				var target = $( event.target ).closest( ".ui-menu-item" );
 				if ( !this.mouseHandled && target.not( ".ui-state-disabled" ).length ) {
-					this.mouseHandled = true;
 					this.select( event );
+					// Only set the mouseHandled flag if the event will bubble, see #9469.
+					if ( !event.isPropagationStopped() ) {
+						this.mouseHandled = true;
+					}
 					// Open submenu on click
 					if ( target.has( ".ui-menu" ).length ) {
 						this.expand( event );
-					} else if ( !this.element.is( ":focus" ) ) {
+					} else if ( !this.element.is( ":focus" ) && $( this.document[ 0 ].activeElement ).closest( ".ui-menu" ).length ) {
 						// Redirect focus to the menu
 						this.element.trigger( "focus", [ true ] );
@@ -178,7 +183,6 @@ $.widget( "ui.menu", {
 	},
 	_keydown: function( event ) {
-		/*jshint maxcomplexity:20*/
 		var match, prev, character, skip, regex,
 			preventDefault = true;
@@ -287,6 +291,8 @@ $.widget( "ui.menu", {
 			icon = this.options.icons.submenu,
 			submenus = this.element.find( this.options.menus );
+		this.element.toggleClass( "ui-menu-icons", !!this.element.find( ".ui-icon" ).length );
 		// Initialize nested menus
 		submenus.filter( ":not(.ui-menu)" )
 			.addClass( "ui-menu ui-widget ui-widget-content ui-corner-all" )
@@ -387,7 +393,7 @@ $.widget( "ui.menu", {
 		}
 		nested = item.children( ".ui-menu" );
-		if ( nested.length && ( /^mouse/.test( event.type ) ) ) {
+		if ( nested.length && event && ( /^mouse/.test( event.type ) ) ) {
 			this._startOpening(nested);
 		}
 		this.activeMenu = item.parent();

data/app/assets/javascripts/jquery.ui.mouse.js CHANGED Viewed

@@ -2,10 +2,10 @@
 //= require jquery.ui.widget
 /*!
- * jQuery UI Mouse 1.10.3
+ * jQuery UI Mouse 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -22,7 +22,7 @@ $( document ).mouseup( function() {
 });
 $.widget("ui.mouse", {
-	version: "1.10.3",
+	version: "1.10.4",
 	options: {
 		cancel: "input,textarea,button,select,option",
 		distance: 1,

data/app/assets/javascripts/jquery.ui.position.js CHANGED Viewed

@@ -1,8 +1,8 @@
 /*!
- * jQuery UI Position 1.10.3
+ * jQuery UI Position 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -70,7 +70,7 @@ $.position = {
 			return cachedScrollbarWidth;
 		}
 		var w1, w2,
-			div = $( "<div style='display:block;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
+			div = $( "<div style='display:block;position:absolute;width:50px;height:50px;overflow:hidden;'><div style='height:100px;width:auto;'></div></div>" ),
 			innerDiv = div.children()[0];
 		$( "body" ).append( div );
@@ -88,8 +88,10 @@ $.position = {
 		return (cachedScrollbarWidth = w1 - w2);
 	},
 	getScrollInfo: function( within ) {
-		var overflowX = within.isWindow ? "" : within.element.css( "overflow-x" ),
-			overflowY = within.isWindow ? "" : within.element.css( "overflow-y" ),
+		var overflowX = within.isWindow || within.isDocument ? "" :
+				within.element.css( "overflow-x" ),
+			overflowY = within.isWindow || within.isDocument ? "" :
+				within.element.css( "overflow-y" ),
 			hasOverflowX = overflowX === "scroll" ||
 				( overflowX === "auto" && within.width < within.element[0].scrollWidth ),
 			hasOverflowY = overflowY === "scroll" ||
@@ -101,10 +103,12 @@ $.position = {
 	},
 	getWithinInfo: function( element ) {
 		var withinElement = $( element || window ),
-			isWindow = $.isWindow( withinElement[0] );
+			isWindow = $.isWindow( withinElement[0] ),
+			isDocument = !!withinElement[ 0 ] && withinElement[ 0 ].nodeType === 9;
 		return {
 			element: withinElement,
 			isWindow: isWindow,
+			isDocument: isDocument,
 			offset: withinElement.offset() || { left: 0, top: 0 },
 			scrollLeft: withinElement.scrollLeft(),
 			scrollTop: withinElement.scrollTop(),
@@ -436,7 +440,7 @@ $.ui.position = {
 				}
 			}
 			else if ( overBottom > 0 ) {
-				newOverTop = position.top -  data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
+				newOverTop = position.top - data.collisionPosition.marginTop + myOffset + atOffset + offset - offsetTop;
 				if ( ( position.top + myOffset + atOffset + offset) > overBottom && ( newOverTop > 0 || abs( newOverTop ) < overBottom ) ) {
 					position.top += myOffset + atOffset + offset;
 				}

data/app/assets/javascripts/jquery.ui.progressbar.js CHANGED Viewed

@@ -2,10 +2,10 @@
 //= require jquery.ui.widget
 /*!
- * jQuery UI Progressbar 1.10.3
+ * jQuery UI Progressbar 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -18,7 +18,7 @@
 (function( $, undefined ) {
 $.widget( "ui.progressbar", {
-	version: "1.10.3",
+	version: "1.10.4",
 	options: {
 		max: 100,
 		value: 0,

data/app/assets/javascripts/jquery.ui.resizable.js CHANGED Viewed

@@ -3,10 +3,10 @@
 //= require jquery.ui.mouse
 /*!
- * jQuery UI Resizable 1.10.3
+ * jQuery UI Resizable 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -28,7 +28,7 @@ function isNumber(value) {
 }
 $.widget("ui.resizable", $.ui.mouse, {
-	version: "1.10.3",
+	version: "1.10.4",
 	widgetEventPrefix: "resize",
 	options: {
 		alsoResize: false,
@@ -297,7 +297,7 @@ $.widget("ui.resizable", $.ui.mouse, {
 		//Store needed variables
 		this.offset = this.helper.offset();
 		this.position = { left: curleft, top: curtop };
-		this.size = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
+		this.size = this._helper ? { width: this.helper.width(), height: this.helper.height() } : { width: el.width(), height: el.height() };
 		this.originalSize = this._helper ? { width: el.outerWidth(), height: el.outerHeight() } : { width: el.width(), height: el.height() };
 		this.originalPosition = { left: curleft, top: curtop };
 		this.sizeDiff = { width: el.outerWidth() - el.width(), height: el.outerHeight() - el.height() };
@@ -778,8 +778,8 @@ $.ui.plugin.add("resizable", "containment", {
 		isParent = that.containerElement.get(0) === that.element.parent().get(0);
 		isOffsetRelative = /relative|absolute/.test(that.containerElement.css("position"));
-		if(isParent && isOffsetRelative) {
-			woset -= that.parentData.left;
+		if ( isParent && isOffsetRelative ) {
+			woset -= Math.abs( that.parentData.left );
 		}
 		if (woset + that.size.width >= that.parentData.width) {
@@ -960,10 +960,20 @@ $.ui.plugin.add("resizable", "grid", {
 			that.size.height = newHeight;
 			that.position.left = op.left - ox;
 		} else {
-			that.size.width = newWidth;
-			that.size.height = newHeight;
-			that.position.top = op.top - oy;
-			that.position.left = op.left - ox;
+			if ( newHeight - gridY > 0 ) {
+				that.size.height = newHeight;
+				that.position.top = op.top - oy;
+			} else {
+				that.size.height = gridY;
+				that.position.top = op.top + os.height - gridY;
+			}
+			if ( newWidth - gridX > 0 ) {
+				that.size.width = newWidth;
+				that.position.left = op.left - ox;
+			} else {
+				that.size.width = gridX;
+				that.position.left = op.left + os.width - gridX;
+			}
 		}
 	}

data/app/assets/javascripts/jquery.ui.selectable.js CHANGED Viewed

@@ -3,10 +3,10 @@
 //= require jquery.ui.mouse
 /*!
- * jQuery UI Selectable 1.10.3
+ * jQuery UI Selectable 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -20,7 +20,7 @@
 (function( $, undefined ) {
 $.widget("ui.selectable", $.ui.mouse, {
-	version: "1.10.3",
+	version: "1.10.4",
 	options: {
 		appendTo: "body",
 		autoRefresh: true,