From 9b908878ae3a9c0fbbd9958b579f223a648c5c69 Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 22 Oct 2012 15:33:57 -0400
Subject: Widget: $.widget.extend(): Properly handle extending a string with an
 object. Fixes #8713 - Passing an object as ui.resizable handles parameter
 does not work.

---
 ui/jquery.ui.widget.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

(limited to 'ui')

diff --git a/ui/jquery.ui.widget.js b/ui/jquery.ui.widget.js
index a125dd5ac..96cc6071c 100644
--- a/ui/jquery.ui.widget.js
+++ b/ui/jquery.ui.widget.js
@@ -143,7 +143,11 @@ $.widget.extend = function( target ) {
 		for ( key in input[ inputIndex ] ) {
 			value = input[ inputIndex ][ key ];
 			if (input[ inputIndex ].hasOwnProperty( key ) && value !== undefined ) {
-				target[ key ] = $.isPlainObject( value ) ? $.widget.extend( {}, target[ key ], value ) : value;
+				if ( $.isPlainObject( value ) && $.isPlainObject( target[ key ] ) ) {
+					target[ key ] = $.widget.extend( {}, target[ key ], value );
+				} else {
+					target[ key ] = value;
+				}
 			}
 		}
 	}
-- 
cgit v1.2.3