From 02033262ee0fb1d9f33c361b3c2ddfa168604854 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Wed, 22 Jan 2014 12:02:32 -0500
Subject: Button: Initial commit of button re-factor

Move to using element stats rather then js class states remove
ui-button-text spans.
Removed button set
---
 ui/widgets/button.js | 597 ++++++++++++++++++++++++---------------------------
 1 file changed, 278 insertions(+), 319 deletions(-)

(limited to 'ui/widgets/button.js')

diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index 94fc75331..34a2afa40 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -22,10 +22,13 @@
 		// AMD. Register as an anonymous module.
 		define( [
 			"jquery",
-			"../data",
+
+			// These are only for backcompat
+			// TODO: Remove after 1.12
+			"./controlgroup",
+			"./checkboxradio",
+
 			"../keycode",
-			"../labels",
-			"../version",
 			"../widget"
 		], factory );
 	} else {
@@ -35,391 +38,347 @@
 	}
 }( function( $ ) {
 
-var lastActive,
-	baseClasses = "ui-button ui-widget ui-state-default ui-corner-all",
-	typeClasses = "ui-button-icons-only ui-button-icon-only ui-button-text-icons ui-button-text-icon-primary ui-button-text-icon-secondary ui-button-text-only",
-	formResetHandler = function() {
-		var form = $( this );
-		setTimeout( function() {
-			form.find( ":ui-button" ).button( "refresh" );
-		}, 1 );
-	},
-	radioGroup = function( radio ) {
-		var name = radio.name,
-			form = radio.form,
-			radios = $( [] );
-		if ( name ) {
-			name = name.replace( /'/g, "\\'" );
-			if ( form ) {
-				radios = $( form ).find( "[name='" + name + "'][type=radio]" );
-			} else {
-				radios = $( "[name='" + name + "'][type=radio]", radio.ownerDocument )
-					.filter( function() {
-						return !this.form;
-					} );
-			}
-		}
-		return radios;
-	};
-
 $.widget( "ui.button", {
 	version: "@VERSION",
 	defaultElement: "<button>",
 	options: {
+		classes: {
+			"ui-button": "ui-corner-all"
+		},
 		disabled: null,
-		text: true,
+		icon: null,
+		iconPosition: "beginning",
 		label: null,
-		icons: {
-			primary: null,
-			secondary: null
-		}
+		showLabel: true
 	},
-	_create: function() {
-		this.element.closest( "form" )
-			.off( "reset" + this.eventNamespace )
-			.on( "reset" + this.eventNamespace, formResetHandler );
 
-		if ( typeof this.options.disabled !== "boolean" ) {
-			this.options.disabled = !!this.element.prop( "disabled" );
-		} else {
-			this.element.prop( "disabled", this.options.disabled );
-		}
+	_getCreateOptions: function() {
+		var disabled,
 
-		this._determineButtonType();
-		this.hasTitle = !!this.buttonElement.attr( "title" );
+			// This is to support cases like in jQuery Mobile where the base widget does have
+			// an implementation of _getCreateOptions
+			options = this._super() || {};
 
-		var that = this,
-			options = this.options,
-			toggleButton = this.type === "checkbox" || this.type === "radio",
-			activeClass = !toggleButton ? "ui-state-active" : "";
+		this.isInput = this.element.is( "input" );
 
-		if ( options.label === null ) {
-			options.label = ( this.type === "input" ? this.buttonElement.val() : this.buttonElement.html() );
+		disabled = this.element[ 0 ].disabled;
+		if ( disabled != null ) {
+			options.disabled = disabled;
 		}
 
-		this._hoverable( this.buttonElement );
+		this.originalLabel = this.isInput ? this.element.val() : this.element.html();
+		if ( this.originalLabel ) {
+			options.label = this.originalLabel;
+		}
 
-		this.buttonElement
-			.addClass( baseClasses )
-			.attr( "role", "button" )
-			.on( "mouseenter" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return;
-				}
-				if ( this === lastActive ) {
-					$( this ).addClass( "ui-state-active" );
-				}
-			} )
-			.on( "mouseleave" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return;
-				}
-				$( this ).removeClass( activeClass );
-			} )
-			.on( "click" + this.eventNamespace, function( event ) {
-				if ( options.disabled ) {
-					event.preventDefault();
-					event.stopImmediatePropagation();
-				}
-			} );
+		return options;
+	},
 
-		// Can't use _focusable() because the element that receives focus
-		// and the element that gets the ui-state-focus class are different
-		this._on( {
-			focus: function() {
-				this.buttonElement.addClass( "ui-state-focus" );
-			},
-			blur: function() {
-				this.buttonElement.removeClass( "ui-state-focus" );
-			}
-		} );
+	_create: function() {
+		if ( !this.option.showLabel & !this.options.icon ) {
+			this.options.showLabel = true;
+		}
 
-		if ( toggleButton ) {
-			this.element.on( "change" + this.eventNamespace, function() {
-				that.refresh();
-			} );
+		// We have to check the option again here even though we did in _getCreateOptions,
+		// because null may have been passed on init which would override what was set in
+		// _getCreateOptions
+		if ( this.options.disabled == null ) {
+			this.options.disabled = this.element[ 0 ].disabled || false;
 		}
 
-		if ( this.type === "checkbox" ) {
-			this.buttonElement.on( "click" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return false;
-				}
-			} );
-		} else if ( this.type === "radio" ) {
-			this.buttonElement.on( "click" + this.eventNamespace, function() {
-				if ( options.disabled ) {
-					return false;
-				}
-				$( this ).addClass( "ui-state-active" );
-				that.buttonElement.attr( "aria-pressed", "true" );
-
-				var radio = that.element[ 0 ];
-				radioGroup( radio )
-					.not( radio )
-					.map( function() {
-						return $( this ).button( "widget" )[ 0 ];
-					} )
-					.removeClass( "ui-state-active" )
-					.attr( "aria-pressed", "false" );
-			} );
-		} else {
-			this.buttonElement
-				.on( "mousedown" + this.eventNamespace, function() {
-					if ( options.disabled ) {
-						return false;
-					}
-					$( this ).addClass( "ui-state-active" );
-					lastActive = this;
-					that.document.one( "mouseup", function() {
-						lastActive = null;
-					} );
-				} )
-				.on( "mouseup" + this.eventNamespace, function() {
-					if ( options.disabled ) {
-						return false;
-					}
-					$( this ).removeClass( "ui-state-active" );
-				} )
-				.on( "keydown" + this.eventNamespace, function( event ) {
-					if ( options.disabled ) {
-						return false;
-					}
-					if ( event.keyCode === $.ui.keyCode.SPACE || event.keyCode === $.ui.keyCode.ENTER ) {
-						$( this ).addClass( "ui-state-active" );
-					}
-				} )
+		this.hasTitle = !!this.element.attr( "title" );
 
-				// see #8559, we bind to blur here in case the button element loses
-				// focus between keydown and keyup, it would be left in an "active" state
-				.on( "keyup" + this.eventNamespace + " blur" + this.eventNamespace, function() {
-					$( this ).removeClass( "ui-state-active" );
-				} );
+		// Check to see if the label needs to be set or if its already correct
+		if ( this.options.label && this.options.label !== this.originalLabel ) {
+			if ( this.isInput ) {
+				this.element.val( this.options.label );
+			} else {
+				this.element.html( this.options.label );
+			}
+		}
+		this._addClass( "ui-button", "ui-widget" );
+		this._setOption( "disabled", this.options.disabled );
+		this._enhance();
 
-			if ( this.buttonElement.is( "a" ) ) {
-				this.buttonElement.on( "keyup", function( event ) {
+		if ( this.element.is( "a" ) ) {
+			this._on( {
+				"keyup": function( event ) {
 					if ( event.keyCode === $.ui.keyCode.SPACE ) {
-
-						// TODO pass through original event correctly (just as 2nd argument doesn't work)
-						$( this ).trigger( "click" );
+						event.preventDefault();
+
+						// Support: PhantomJS <= 1.9, IE 8 Only
+						// If a native click is available use it so we actually cause navigation
+						// otherwise just trigger a click event
+						if ( this.element[ 0 ].click ) {
+							this.element[ 0 ].click();
+						} else {
+							this.element.trigger( "click" );
+						}
 					}
-				} );
-			}
+				}
+			} );
 		}
+	},
+
+	_enhance: function() {
+		this.element.attr( "role", "button" );
 
-		this._setOption( "disabled", options.disabled );
-		this._resetButton();
+		if ( this.options.icon ) {
+			this._updateIcon( "icon", this.options.icon );
+			this._updateTooltip();
+		}
 	},
 
-	_determineButtonType: function() {
-		var ancestor, labelSelector, checked;
+	_updateTooltip: function() {
+		this.title = this.element.attr( "title" );
 
-		if ( this.element.is( "[type=checkbox]" ) ) {
-			this.type = "checkbox";
-		} else if ( this.element.is( "[type=radio]" ) ) {
-			this.type = "radio";
-		} else if ( this.element.is( "input" ) ) {
-			this.type = "input";
-		} else {
-			this.type = "button";
+		if ( !this.options.showLabel && !this.title ) {
+			this.element.attr( "title", this.options.label );
 		}
+	},
 
-		if ( this.type === "checkbox" || this.type === "radio" ) {
-
-			// we don't search against the document in case the element
-			// is disconnected from the DOM
-			ancestor = this.element.parents().last();
-			labelSelector = "label[for='" + this.element.attr( "id" ) + "']";
-			this.buttonElement = ancestor.find( labelSelector );
-			if ( !this.buttonElement.length ) {
-				ancestor = ancestor.length ? ancestor.siblings() : this.element.siblings();
-				this.buttonElement = ancestor.filter( labelSelector );
-				if ( !this.buttonElement.length ) {
-					this.buttonElement = ancestor.find( labelSelector );
-				}
+	_updateIcon: function( option, value ) {
+		var icon = option !== "iconPosition",
+			position = icon ? this.options.iconPosition : value,
+			displayBlock = position === "top" || position === "bottom";
+
+		// Create icon
+		if ( !this.icon ) {
+			this.icon = $( "<span>" );
+
+			this._addClass( this.icon, "ui-button-icon", "ui-icon" );
+
+			if ( !this.options.showLabel ) {
+				this._addClass( "ui-button-icon-only" );
 			}
-			this.element.addClass( "ui-helper-hidden-accessible" );
+		} else if ( icon ) {
+
+			// If we are updating the icon remove the old icon class
+			this._removeClass( this.icon, null, this.options.icon );
+		}
+
+		// If we are updating the icon add the new icon class
+		if ( icon ) {
+			this._addClass( this.icon, null, value );
+		}
 
-			checked = this.element.is( ":checked" );
-			if ( checked ) {
-				this.buttonElement.addClass( "ui-state-active" );
+		this._attachIcon( position );
+
+		// If the icon is on top or bottom we need to add the ui-widget-icon-block class and remove
+		// the iconSpace if there is one.
+		if ( displayBlock ) {
+			this._addClass( this.icon, null, "ui-widget-icon-block" );
+			if ( this.iconSpace ) {
+				this.iconSpace.remove();
 			}
-			this.buttonElement.prop( "aria-pressed", checked );
 		} else {
-			this.buttonElement = this.element;
-		}
-	},
 
-	widget: function() {
-		return this.buttonElement;
+			// Position is beginning or end so remove the ui-widget-icon-block class and add the
+			// space if it does not exist
+			if ( !this.iconSpace ) {
+				this.iconSpace = $( "<span> </span>" );
+				this._addClass( this.iconSpace, "ui-button-icon-space" );
+			}
+			this._removeClass( this.icon, null, "ui-wiget-icon-block" );
+			this._attachIconSpace( position );
+		}
 	},
 
 	_destroy: function() {
-		this.element
-			.removeClass( "ui-helper-hidden-accessible" );
-		this.buttonElement
-			.removeClass( baseClasses + " ui-state-active " + typeClasses )
-			.removeAttr( "role aria-pressed" )
-			.html( this.buttonElement.find( ".ui-button-text" ).html() );
+		this.element.removeAttr( "role" );
 
+		if ( this.icon ) {
+			this.icon.remove();
+		}
+		if ( this.iconSpace ) {
+			this.iconSpace.remove();
+		}
 		if ( !this.hasTitle ) {
-			this.buttonElement.removeAttr( "title" );
+			this.element.removeAttr( "title" );
 		}
 	},
 
-	_setOption: function( key, value ) {
-		this._super( key, value );
-		if ( key === "disabled" ) {
-			this.widget().toggleClass( "ui-state-disabled", !!value );
-			this.element.prop( "disabled", !!value );
-			if ( value ) {
-				if ( this.type === "checkbox" || this.type === "radio" ) {
-					this.buttonElement.removeClass( "ui-state-focus" );
-				} else {
-					this.buttonElement.removeClass( "ui-state-focus ui-state-active" );
-				}
-			}
-			return;
-		}
-		this._resetButton();
+	_attachIconSpace: function( iconPosition ) {
+		this.icon[ /^(?:end|bottom)/.test( iconPosition ) ? "before" : "after" ]( this.iconSpace );
 	},
 
-	refresh: function() {
+	_attachIcon: function( iconPosition ) {
+		this.element[ /^(?:end|bottom)/.test( iconPosition ) ? "append" : "prepend" ]( this.icon );
+	},
 
-		//See #8237 & #8828
-		var isDisabled = this.element.is( "input, button" ) ? this.element.is( ":disabled" ) : this.element.hasClass( "ui-button-disabled" );
+	_setOptions: function( options ) {
+		var newShowLabel = options.showLabel === undefined ?
+				this.options.showLabel :
+				options.showLabel,
+			newIcon = options.icon === undefined ? this.options.icon : options.icon;
 
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOption( "disabled", isDisabled );
-		}
-		if ( this.type === "radio" ) {
-			radioGroup( this.element[ 0 ] ).each( function() {
-				if ( $( this ).is( ":checked" ) ) {
-					$( this ).button( "widget" )
-						.addClass( "ui-state-active" )
-						.attr( "aria-pressed", "true" );
-				} else {
-					$( this ).button( "widget" )
-						.removeClass( "ui-state-active" )
-						.attr( "aria-pressed", "false" );
-				}
-			} );
-		} else if ( this.type === "checkbox" ) {
-			if ( this.element.is( ":checked" ) ) {
-				this.buttonElement
-					.addClass( "ui-state-active" )
-					.attr( "aria-pressed", "true" );
-			} else {
-				this.buttonElement
-					.removeClass( "ui-state-active" )
-					.attr( "aria-pressed", "false" );
-			}
+		if ( !newShowLabel && !newIcon ) {
+			options.showLabel = true;
 		}
+		this._super( options );
 	},
 
-	_resetButton: function() {
-		if ( this.type === "input" ) {
-			if ( this.options.label ) {
-				this.element.val( this.options.label );
+	_setOption: function( key, value ) {
+		if ( key === "icon" ) {
+			if ( value ) {
+				this._updateIcon( key, value );
+			} else if ( this.icon ) {
+				this.icon.remove();
+				if ( this.iconSpace ) {
+					this.iconSpace.remove();
+				}
 			}
-			return;
 		}
-		var buttonElement = this.buttonElement.removeClass( typeClasses ),
-			buttonText = $( "<span></span>", this.document[ 0 ] )
-				.addClass( "ui-button-text" )
-				.html( this.options.label )
-				.appendTo( buttonElement.empty() )
-				.text(),
-			icons = this.options.icons,
-			multipleIcons = icons.primary && icons.secondary,
-			buttonClasses = [];
-
-		if ( icons.primary || icons.secondary ) {
-			if ( this.options.text ) {
-				buttonClasses.push( "ui-button-text-icon" + ( multipleIcons ? "s" : ( icons.primary ? "-primary" : "-secondary" ) ) );
-			}
 
-			if ( icons.primary ) {
-				buttonElement.prepend( "<span class='ui-button-icon-primary ui-icon " + icons.primary + "'></span>" );
-			}
+		if ( key === "iconPosition" ) {
+			this._updateIcon( key, value );
+		}
 
-			if ( icons.secondary ) {
-				buttonElement.append( "<span class='ui-button-icon-secondary ui-icon " + icons.secondary + "'></span>" );
-			}
+		// Make sure we can't end up with a button that has neither text nor icon
+		if ( key === "showLabel" ) {
+				this._toggleClass( this._classes( "ui-button-icon-only" ), null, !value );
+				this._updateTooltip();
+		}
 
-			if ( !this.options.text ) {
-				buttonClasses.push( multipleIcons ? "ui-button-icons-only" : "ui-button-icon-only" );
+		if ( key === "label" ) {
+			if ( this.isInput ) {
+				this.element.val( value );
+			} else {
 
-				if ( !this.hasTitle ) {
-					buttonElement.attr( "title", $.trim( buttonText ) );
+				// If there is an icon, append it, else nothing then append the value
+				// this avoids removal of the icon when setting label text
+				this.element.html( value );
+				if ( this.icon ) {
+					this._attachIcon( this.options.iconPosition );
+					this._attachIconSpace( this.options.iconPosition );
 				}
 			}
-		} else {
-			buttonClasses.push( "ui-button-text-only" );
 		}
-		buttonElement.addClass( buttonClasses.join( " " ) );
-	}
-} );
-
-$.widget( "ui.buttonset", {
-	version: "@VERSION",
-	options: {
-		items: "button, input[type=button], input[type=submit], input[type=reset], input[type=checkbox], input[type=radio], a, :data(ui-button)"
-	},
 
-	_create: function() {
-		this.element.addClass( "ui-buttonset" );
-	},
-
-	_init: function() {
-		this.refresh();
-	},
+		this._super( key, value );
 
-	_setOption: function( key, value ) {
 		if ( key === "disabled" ) {
-			this.buttons.button( "option", key, value );
+			this._toggleClass( null, "ui-state-disabled", value );
+			this.element[ 0 ].disabled = value;
+			if ( value ) {
+				this.element.blur();
+			}
 		}
-
-		this._super( key, value );
 	},
 
 	refresh: function() {
-		var rtl = this.element.css( "direction" ) === "rtl",
-			allButtons = this.element.find( this.options.items ),
-			existingButtons = allButtons.filter( ":ui-button" );
-
-		// Initialize new buttons
-		allButtons.not( ":ui-button" ).button();
-
-		// Refresh existing buttons
-		existingButtons.button( "refresh" );
-
-		this.buttons = allButtons
-			.map( function() {
-				return $( this ).button( "widget" )[ 0 ];
-			} )
-				.removeClass( "ui-corner-all ui-corner-left ui-corner-right" )
-				.filter( ":first" )
-					.addClass( rtl ? "ui-corner-right" : "ui-corner-left" )
-				.end()
-				.filter( ":last" )
-					.addClass( rtl ? "ui-corner-left" : "ui-corner-right" )
-				.end()
-			.end();
-	},
 
-	_destroy: function() {
-		this.element.removeClass( "ui-buttonset" );
-		this.buttons
-			.map( function() {
-				return $( this ).button( "widget" )[ 0 ];
-			} )
-				.removeClass( "ui-corner-left ui-corner-right" )
-			.end()
-			.button( "destroy" );
+		// Make sure to only check disabled if its an element that supports this otherwise
+		// check for the disabled class to determine state
+		var isDisabled = this.element.is( "input, button" ) ?
+			this.element[ 0 ].disabled : this.element.hasClass( "ui-button-disabled" );
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOptions( { disabled: isDisabled } );
+		}
+
+		this._updateTooltip();
 	}
 } );
 
+// DEPRECATED
+if ( $.uiBackCompat !== false ) {
+
+	// Text and Icons options
+	$.widget( "ui.button", $.ui.button, {
+		options: {
+			text: true,
+			icons: {
+				primary: null,
+				secondary: null
+			}
+		},
+
+		_create: function() {
+			if ( this.options.showLabel && !this.options.text ) {
+				this.options.showLabel = this.options.text;
+			}
+			if ( !this.options.showLabel && this.options.text ) {
+				this.options.text = this.options.showLabel;
+			}
+			if ( !this.options.icon && ( this.options.icons.primary ||
+					this.options.icons.secondary ) ) {
+				if ( this.options.icons.primary ) {
+					this.options.icon = this.options.icons.primary;
+				} else {
+					this.options.icon = this.options.icons.secondary;
+					this.options.iconPosition = "end";
+				}
+			} else if ( this.options.icon ) {
+				this.options.icons.primary = this.options.icon;
+			}
+			this._super();
+		},
+
+		_setOption: function( key, value ) {
+			if ( key === "text" ) {
+				this._super( "showLabel", value );
+				return;
+			}
+			if ( key === "showLabel" ) {
+				this.options.text = value;
+			}
+			if ( key === "icon" ) {
+				this.options.icons.primary = value;
+			}
+			if ( key === "icons" ) {
+				if ( value.primary ) {
+					this._super( "icon", value.primary );
+					this._super( "iconPosition", "beginning" );
+				} else if ( value.secondary ) {
+					this._super( "icon", value.secondary );
+					this._super( "iconPosition", "end" );
+				}
+			}
+			this._superApply( arguments );
+		}
+	} );
+
+	$.fn.button = ( function( orig ) {
+		return function() {
+			if ( !this.length || ( this.length && this[ 0 ].tagName !== "INPUT" ) ||
+					( this.length && this[ 0 ].tagName === "INPUT" && (
+						this.attr( "type" ) !== "checkbox" && this.attr( "type" ) !== "radio"
+					) ) ) {
+				return orig.apply( this, arguments );
+			}
+			if ( !$.ui.checkboxradio ) {
+				$.error( "Checkboxradio widget missing" );
+			}
+			if ( arguments.length === 0 ) {
+				return this.checkboxradio( {
+					"icon": false
+				} );
+			}
+			return this.checkboxradio.apply( this, arguments );
+		};
+	} )( $.fn.button );
+
+	$.fn.buttonset = function() {
+		if ( !$.ui.controlgroup ) {
+			$.error( "Controlgroup widget missing" );
+		}
+		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" && arguments[ 2 ] ) {
+			return this.controlgroup.apply( this,
+				[ arguments[ 0 ], "items.button", arguments[ 2 ] ] );
+		}
+		if ( arguments[ 0 ] === "option" && arguments[ 1 ] === "items" ) {
+			return this.controlgroup.apply( this, [ arguments[ 0 ], "items.button" ] );
+		}
+		if ( typeof arguments[ 0 ] === "object" && arguments[ 0 ].items ) {
+			arguments[ 0 ].items = {
+				button: arguments[ 0 ].items
+			};
+		}
+		return this.controlgroup.apply( this, arguments );
+	};
+}
+
 return $.ui.button;
 
 } ) );
-- 
cgit v1.2.3


From 16abde399daa07e11f3b972ab675d59374cf08be Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Wed, 7 Jan 2015 21:51:38 -0500
Subject: Spinner: Updates for new button widget and classes option

---
 demos/button/default.html                 |   9 +-
 demos/button/icons.html                   |  10 +-
 demos/button/splitbutton.html             |  70 --------
 demos/button/toolbar.html                 | 115 ------------
 demos/checkboxradio/default.html          |   9 +-
 demos/checkboxradio/no-icons.html         |   9 +-
 demos/checkboxradio/product-selector.html |  10 +-
 demos/checkboxradio/radiogroup.html       |  10 +-
 tests/unit/button/common-deprecated.js    |   2 +-
 tests/unit/button/core.js                 |   1 +
 tests/unit/button/deprecated.js           |   2 +-
 tests/unit/checkboxradio/common.js        |   2 +-
 tests/unit/checkboxradio/core.js          |   2 +-
 tests/unit/checkboxradio/events.js        |  72 +-------
 tests/unit/checkboxradio/methods.js       |   2 +-
 tests/unit/checkboxradio/options.js       |   2 +-
 ui/checkboxradio.js                       | 289 ------------------------------
 ui/widgets/button.js                      |   3 +-
 ui/widgets/checkboxradio.js               | 265 +++++++++++++++++++++++++++
 ui/widgets/spinner.js                     |  12 +-
 20 files changed, 293 insertions(+), 603 deletions(-)
 delete mode 100644 demos/button/splitbutton.html
 delete mode 100644 demos/button/toolbar.html
 delete mode 100644 ui/checkboxradio.js
 create mode 100644 ui/widgets/checkboxradio.js

(limited to 'ui/widgets/button.js')

diff --git a/demos/button/default.html b/demos/button/default.html
index 5418fd8c9..644dcd225 100644
--- a/demos/button/default.html
+++ b/demos/button/default.html
@@ -5,18 +5,13 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Button - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$( function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( ".widget input[type=submit], .widget a, .widget button" ).button();
 		$( "button, input, a" ).click( function( event ) {
 			event.preventDefault();
 		} );
-	} );
 	</script>
 </head>
 <body>
diff --git a/demos/button/icons.html b/demos/button/icons.html
index a8deca9cd..af4e3000c 100644
--- a/demos/button/icons.html
+++ b/demos/button/icons.html
@@ -5,13 +5,9 @@
 	<meta name="viewport" content="width=device-width, initial-scale=1">
 	<title>jQuery UI Button - Icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$( function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( ".widget button" ).first()
 			.button()
 			.next().button( {
@@ -29,7 +25,6 @@
 				icon: "ui-icon-gear",
 				iconPosition: "bottom"
 			} );
-	} );
 	</script>
 </head>
 <body>
@@ -41,7 +36,6 @@
 	<button>Button with icon on the right</button>
 	<button>Button with icon on the top</button>
 	<button>Button with icon on the bottom</button>
-	<button>Button with icon on the top</button>
 </div>
 <div class="css">
 	<h1>CSS</h1>
diff --git a/demos/button/splitbutton.html b/demos/button/splitbutton.html
deleted file mode 100644
index 6b7562d68..000000000
--- a/demos/button/splitbutton.html
+++ /dev/null
@@ -1,70 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>jQuery UI Button - Split button</title>
-	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
-	<script src="../../ui/position.js"></script>
-	<script src="../../ui/menu.js"></script>
-	<link rel="stylesheet" href="../demos.css">
-	<style>
-		.ui-menu { position: absolute; width: 100px; }
-	</style>
-	<script>
-	$(function() {
-		$( "#rerun" )
-			.button()
-			.on( "click", function() {
-				alert( "Running the last action" );
-			})
-			.next()
-				.button({
-					text: false,
-					icons: {
-						primary: "ui-icon-triangle-1-s"
-					}
-				})
-				.on( "click", function() {
-					var menu = $( this ).parent().next().show().position({
-						my: "left top",
-						at: "left bottom",
-						of: this
-					});
-					$( document ).one( "click", function() {
-						menu.hide();
-					});
-					return false;
-				})
-				.parent()
-					.buttonset()
-					.next()
-						.hide()
-						.menu();
-	});
-	</script>
-</head>
-<body>
-
-<div>
-	<div>
-		<button id="rerun">Run last action</button>
-		<button id="select">Select an action</button>
-	</div>
-	<ul>
-		<li><div>Open...</div></li>
-		<li><div>Save</div></li>
-		<li><div>Delete</div></li>
-	</ul>
-</div>
-
-<div class="demo-description">
-<p>An example of a split button built with two buttons: A plain button with just text, one with only a primary icon
-and no text. Both are grouped together in a set.</p>
-</div>
-</body>
-</html>
diff --git a/demos/button/toolbar.html b/demos/button/toolbar.html
deleted file mode 100644
index f2c242f1f..000000000
--- a/demos/button/toolbar.html
+++ /dev/null
@@ -1,115 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<meta name="viewport" content="width=device-width, initial-scale=1">
-	<title>jQuery UI Button - Toolbar</title>
-	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/button.js"></script>
-	<link rel="stylesheet" href="../demos.css">
-	<style>
-	#toolbar {
-		padding: 4px;
-		display: inline-block;
-	}
-	</style>
-	<script>
-	$(function() {
-		$( "#beginning" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-start"
-			}
-		});
-		$( "#rewind" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-prev"
-			}
-		});
-		$( "#play" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-play"
-			}
-		})
-		.on( "click", function() {
-			var options;
-			if ( $( this ).text() === "play" ) {
-				options = {
-					label: "pause",
-					icons: {
-						primary: "ui-icon-pause"
-					}
-				};
-			} else {
-				options = {
-					label: "play",
-					icons: {
-						primary: "ui-icon-play"
-					}
-				};
-			}
-			$( this ).button( "option", options );
-		});
-		$( "#stop" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-stop"
-			}
-		})
-		.on( "click", function() {
-			$( "#play" ).button( "option", {
-				label: "play",
-				icons: {
-					primary: "ui-icon-play"
-				}
-			});
-		});
-		$( "#forward" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-next"
-			}
-		});
-		$( "#end" ).button({
-			text: false,
-			icons: {
-				primary: "ui-icon-seek-end"
-			}
-		});
-		$( "#shuffle" ).button();
-		$( "#repeat" ).buttonset();
-	});
-	</script>
-</head>
-<body>
-
-<div id="toolbar" class="ui-widget-header ui-corner-all">
-	<button id="beginning">go to beginning</button>
-	<button id="rewind">rewind</button>
-	<button id="play">play</button>
-	<button id="stop">stop</button>
-	<button id="forward">fast forward</button>
-	<button id="end">go to end</button>
-
-	<input type="checkbox" id="shuffle" /><label for="shuffle">Shuffle</label>
-
-	<span id="repeat">
-		<input type="radio" id="repeat0" name="repeat" checked="checked" /><label for="repeat0">No Repeat</label>
-		<input type="radio" id="repeat1" name="repeat" /><label for="repeat1">Once</label>
-		<input type="radio" id="repeatall" name="repeat" /><label for="repeatall">All</label>
-	</span>
-</div>
-
-<div class="demo-description">
-<p>
-	A mediaplayer toolbar. Take a look at the underlying markup: A few button elements,
-	an input of type checkbox for the Shuffle button, and three inputs of type radio for the Repeat options.
-</p>
-</div>
-</body>
-</html>
diff --git a/demos/checkboxradio/default.html b/demos/checkboxradio/default.html
index c8f4c5566..c8c1a800d 100644
--- a/demos/checkboxradio/default.html
+++ b/demos/checkboxradio/default.html
@@ -4,17 +4,12 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - Default functionality</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio({
 			label: "foo"
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/checkboxradio/no-icons.html b/demos/checkboxradio/no-icons.html
index 64b511246..c738d8ca8 100644
--- a/demos/checkboxradio/no-icons.html
+++ b/demos/checkboxradio/no-icons.html
@@ -4,17 +4,12 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - No Icons</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio({
 			icon: false
 		});
-	});
 	</script>
 </head>
 <body>
diff --git a/demos/checkboxradio/product-selector.html b/demos/checkboxradio/product-selector.html
index f8da07118..4e6db4507 100644
--- a/demos/checkboxradio/product-selector.html
+++ b/demos/checkboxradio/product-selector.html
@@ -4,14 +4,9 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - Product Selector</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
-	<script src="../../ui/controlgroup.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio();
 		$( "[name='shape']").on( "change", function(){
 			$( ".shape" ).removeClass( "circle pill square rectangle" )
@@ -34,7 +29,6 @@
 		$( ".toggles" ).controlgroup({
 			direction: "vertical"
 		});
-	});
 	</script>
 	<style>
 		.shape {
diff --git a/demos/checkboxradio/radiogroup.html b/demos/checkboxradio/radiogroup.html
index b307db82d..bfca290b0 100644
--- a/demos/checkboxradio/radiogroup.html
+++ b/demos/checkboxradio/radiogroup.html
@@ -4,17 +4,11 @@
 	<meta charset="utf-8">
 	<title>jQuery UI Checkboxradio - Radio Group</title>
 	<link rel="stylesheet" href="../../themes/base/all.css">
-	<script src="../../external/jquery/jquery.js"></script>
-	<script src="../../ui/core.js"></script>
-	<script src="../../ui/widget.js"></script>
-	<script src="../../ui/checkboxradio.js"></script>
-	<script src="../../ui/controlgroup.js"></script>
 	<link rel="stylesheet" href="../demos.css">
-	<script>
-	$(function() {
+	<script src="../../external/requirejs/require.js"></script>
+	<script src="../bootstrap.js">
 		$( "input" ).checkboxradio();
 		$( "fieldset" ).controlgroup();
-	});
 	</script>
 </head>
 <body>
diff --git a/tests/unit/button/common-deprecated.js b/tests/unit/button/common-deprecated.js
index 1441d3a8a..0f03bdba2 100644
--- a/tests/unit/button/common-deprecated.js
+++ b/tests/unit/button/common-deprecated.js
@@ -1,6 +1,6 @@
 define( [
 	"lib/common",
-	"ui/button"
+	"ui/widgets/button"
 ], function( common ) {
 
 common.testWidget( "button", {
diff --git a/tests/unit/button/core.js b/tests/unit/button/core.js
index a7c164a33..de26b0312 100644
--- a/tests/unit/button/core.js
+++ b/tests/unit/button/core.js
@@ -1,5 +1,6 @@
 define( [
 	"jquery",
+	"ui/safe-active-element",
 	"ui/widgets/button"
 ], function( $ ) {
 
diff --git a/tests/unit/button/deprecated.js b/tests/unit/button/deprecated.js
index bb023ab4f..fac02e2a6 100644
--- a/tests/unit/button/deprecated.js
+++ b/tests/unit/button/deprecated.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/button"
+	"ui/widgets/button"
 ], function( $ ) {
 
 module( "Button (deprecated): core" );
diff --git a/tests/unit/checkboxradio/common.js b/tests/unit/checkboxradio/common.js
index 6a739435f..0dd663d07 100644
--- a/tests/unit/checkboxradio/common.js
+++ b/tests/unit/checkboxradio/common.js
@@ -1,6 +1,6 @@
 define( [
 	"lib/common",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( common ) {
 
 common.testWidget( "checkboxradio", {
diff --git a/tests/unit/checkboxradio/core.js b/tests/unit/checkboxradio/core.js
index e70ca58c1..70ed4bb69 100644
--- a/tests/unit/checkboxradio/core.js
+++ b/tests/unit/checkboxradio/core.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: core" );
diff --git a/tests/unit/checkboxradio/events.js b/tests/unit/checkboxradio/events.js
index e5909a386..ad7f1e75f 100644
--- a/tests/unit/checkboxradio/events.js
+++ b/tests/unit/checkboxradio/events.js
@@ -1,80 +1,10 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: events" );
 
-asyncTest( "form reset / click", function( assert ) {
-	expect( 35 );
-
-	var radios = [
-			$( "#radio11" ).checkboxradio(),
-			$( "#radio12" ).checkboxradio(),
-			$( "#radio13" ).checkboxradio()
-		],
-		widgets = [
-			radios[ 0 ].checkboxradio( "widget" ),
-			radios[ 1 ].checkboxradio( "widget" ),
-			radios[ 2 ].checkboxradio( "widget" )
-		],
-		form1 = $( "#form1" ),
-		form2 = $( "#form2" );
-
-	// Checkes that only the specified radio is checked in the group
-	function assertChecked( checked ) {
-		$.each( widgets, function( index ) {
-			var method = index === checked ? "hasClasses" : "lacksClasses";
-
-			assert[ method ]( widgets[ index ], "ui-checkboxradio-checked ui-state-active" );
-		} );
-	}
-
-	// Checks the form count on each form
-	function assertFormCount( count ) {
-		equal( form1.data( "uiCheckboxradioCount" ), count, "Form1 has a count of " + count );
-		equal( form2.data( "uiCheckboxradioCount" ), 3, "Form2 has a count of 3" );
-	}
-
-	// Run the tests
-	function testForms( current, start ) {
-		assertChecked( 2 );
-
-		if ( !start && current !== 0 ) {
-			radios[ current - 1 ].checkboxradio( "destroy" );
-		}
-
-		assertFormCount( 3 - current );
-
-		radios[ current ].prop( "checked", true );
-		radios[ current ].trigger( "change" );
-		assertChecked( current );
-
-		form1.trigger( "reset" );
-	}
-
-	// Recoursivly run the tests in a setTimeout with call back for the resets
-	function iterate( i ) {
-		setTimeout( function() {
-			if ( i < 3 ) {
-				testForms( i );
-				iterate( i + 1 );
-				return;
-			}
-			radios[ 2 ].checkboxradio( "destroy" );
-			assertChecked( false );
-			start();
-		} );
-	}
-
-	$( "#form2 input" ).checkboxradio();
-
-	// Check the starting state then kick everything off
-	testForms( 0, true );
-	iterate( 0 );
-
-} );
-
 asyncTest(
 	"Resetting a checkbox's form should refresh the visual state of the checkbox",
 	function( assert ) {
diff --git a/tests/unit/checkboxradio/methods.js b/tests/unit/checkboxradio/methods.js
index f189c9eea..c0ce9fde6 100644
--- a/tests/unit/checkboxradio/methods.js
+++ b/tests/unit/checkboxradio/methods.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: methods" );
diff --git a/tests/unit/checkboxradio/options.js b/tests/unit/checkboxradio/options.js
index 11bd072ca..1998ff54e 100644
--- a/tests/unit/checkboxradio/options.js
+++ b/tests/unit/checkboxradio/options.js
@@ -1,6 +1,6 @@
 define( [
 	"jquery",
-	"ui/checkboxradio"
+	"ui/widgets/checkboxradio"
 ], function( $ ) {
 
 module( "Checkboxradio: options" );
diff --git a/ui/checkboxradio.js b/ui/checkboxradio.js
deleted file mode 100644
index 84f69afaa..000000000
--- a/ui/checkboxradio.js
+++ /dev/null
@@ -1,289 +0,0 @@
-/*!
- * jQuery UI Checkboxradio @VERSION
- * http://jqueryui.com
- *
- * Copyright 2014 jQuery Foundation and other contributors
- * Released under the MIT license.
- * http://jquery.org/license
- *
- * http://api.jqueryui.com/checkboxradio/
- */
-( function( factory ) {
-	if ( typeof define === "function" && define.amd ) {
-
-		// AMD. Register as an anonymous module.
-		define( [
-			"jquery",
-			"./core",
-			"./widget"
-		], factory );
-	} else {
-
-		// Browser globals
-		factory( jQuery );
-	}
-}( function( $ ) {
-
-// Remove and replace with reset handler extension
-var formResetHandler = function() {
-		var form = $( this );
-
-		// Wait for the form reset to actually happen before refreshing
-		setTimeout( function() {
-
-			// We dont filter for css only versions since css only is not supported
-			form.find( ".ui-checkboxradio" ).checkboxradio( "refresh" );
-		} );
-	};
-
-$.widget( "ui.checkboxradio", {
-	version: "@VERSION",
-	options: {
-		disabled: null,
-		label: null,
-		icon: true,
-		classes: {
-			"ui-checkboxradio-label": "ui-corner-all",
-			"ui-checkboxradio-icon": "ui-corner-all"
-		}
-	},
-
-	_getCreateOptions: function() {
-		var disabled, labels,
-			that = this,
-			options = this._super() || {};
-
-		// We read the type here, because it makes more sense to throw a element type error first,
-		// rather then the error for lack of a label. Often if its the wrong type, it
-		// won't have a label (e.g. calling on a div, btn, etc)
-		this._readType();
-
-		labels = this.element.labels();
-
-		// Todo: For now we will use the last label we need to check about the best
-		// way to handle multiple labels with some accessability experts
-		this.label = $( labels[ labels.length - 1 ] );
-		if ( !this.label.length ) {
-			$.error( "No label found for checkboxradio widget" );
-		}
-
-		this.originalLabel = "";
-
-		// We need to get the label text but this may also need to make sure it does not contain the
-		// input itself.
-		this.label.contents().not( this.element ).each( function() {
-
-			// The label contents could be text html or a mix we concat each element to get a string
-			// representation of the label without the input as part of it.
-			that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML;
-		} );
-
-		// Set the label option if we found label text
-		if ( this.originalLabel ) {
-			options.label = this.originalLabel;
-		}
-
-		disabled = this.element[ 0 ].disabled;
-		if ( disabled != null ) {
-			options.disabled = disabled;
-		}
-		return options;
-	},
-
-	_create: function() {
-		var formCount,
-			checked = this.element[ 0 ].checked,
-			form = this.element.form();
-		this.formParent = !!form.length ? form : $( "body" );
-
-		formCount = this.formParent.data( "uiCheckboxradioCount" ) || 0;
-
-		// We don't use _on and _off here because we want all the checkboxes in the same form to use
-		// single handler which handles all the checkboxradio widgets in the form
-		if ( formCount === 0 ) {
-			this.formParent.on( "reset." + this.widgetFullName, formResetHandler );
-		}
-
-		this.formParent.data( "uiCheckboxradioCount", formCount + 1 );
-
-		if ( this.options.disabled == null ) {
-			this.options.disabled = this.element[ 0 ].disabled || false;
-		}
-
-		this._setOption( "disabled", this.options.disabled );
-		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
-		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
-
-		if ( this.type === "radio" ) {
-			this._addClass( this.label, "ui-checkboxradio-radio-label" );
-		}
-
-		if ( this.options.label && this.options.label !== this.originalLabel ) {
-			this._updateLabel();
-		} else if ( this.originalLabel ) {
-			this.options.label = this.originalLabel;
-		}
-
-		this._enhance();
-
-		if ( checked ) {
-			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
-			this._addClass( this.icon, null, "ui-state-hover" );
-		}
-
-		this._on( {
-			"change": "_toggleClasses",
-			"focus": function() {
-				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			},
-			"blur": function() {
-				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
-			}
-		} );
-	},
-
-	_readType: function() {
-		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
-		this.type = this.element[ 0 ].type;
-		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
-			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
-				" and element.type=" + this.type );
-		}
-	},
-
-	// Support jQuery Mobile enhanced option
-	_enhance: function() {
-		this._updateIcon( this.element[ 0 ].checked );
-	},
-
-	widget: function() {
-		return this.label;
-	},
-
-	_getRadioGroup: function() {
-		var name = this.element[ 0 ].name,
-			that = this,
-			radios = $( [] );
-
-		if ( name ) {
-			name = $.ui.escapeSelector( name );
-			radios = this.formParent.find( "[name='" + $.ui.escapeSelector( name ) + "']" ).filter( function() {
-				var form = $( this ).form();
-				return ( form.length ? form : $( "body" ) )[ 0 ] === that.formParent[ 0 ];
-			} );
-		}
-		return radios.not( this.element );
-	},
-
-	_toggleClasses: function() {
-		var checked = this.element[ 0 ].checked;
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-
-		if ( this.options.icon && this.type === "checkbox" ) {
-
-			// We add ui-state-highlight to change the icon color
-			this._toggleClass( this.icon, null, "ui-icon-check ui-state-highlight", checked )
-				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
-		}
-		if ( this.type === "radio" ) {
-			this._getRadioGroup()
-				.each( function() {
-					var instance = $( this ).checkboxradio( "instance" );
-
-					if ( instance ) {
-						instance._removeClass( instance.label,
-							"ui-checkboxradio-checked", "ui-state-active" );
-					}
-				} );
-		}
-	},
-
-	_destroy: function() {
-		var formCount = this.formParent.data( "uiCheckboxradioCount" ) - 1;
-
-		this.formParent.data( "uiCheckboxradioCount", formCount );
-
-		if ( formCount === 0 ) {
-			this.formParent.off( "reset." + this.widgetFullName, formResetHandler );
-		}
-
-		if ( this.icon ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-		}
-	},
-
-	_setOption: function( key, value ) {
-
-		// We don't alow the value to be set to nothing
-		if ( key === "label" && !value ) {
-			return;
-		}
-
-		this._super( key, value );
-
-		if ( key === "disabled" ) {
-			this._toggleClass( this.label, null, "ui-state-disabled", value );
-			this.element[ 0 ].disabled = value;
-
-			// Don't refresh if disabled
-			return;
-		}
-		this.refresh();
-	},
-
-	_updateIcon: function( checked ) {
-		var toAdd = "ui-icon ui-icon-background ";
-
-		if ( this.options.icon ) {
-			if ( !this.icon ) {
-				this.icon = $( "<span>" );
-				this.iconSpace = $( "<span> </span>" );
-				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
-			}
-
-			if ( this.type === "checkbox" ) {
-				toAdd += checked ? "ui-icon-check" : "ui-icon-blank";
-				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
-			} else {
-				toAdd += "ui-icon-blank";
-			}
-			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
-			if ( !checked ) {
-				this._removeClass( this.icon, null, "ui-icon-check" );
-			}
-			this.icon.prependTo( this.label ).after( this.iconSpace );
-		} else if ( this.icon !== undefined ) {
-			this.icon.remove();
-			this.iconSpace.remove();
-			delete this.icon;
-		}
-	},
-
-	_updateLabel: function() {
-
-		// Remove the contents of the label ( minus the icon, icon space, and input )
-		this.label.contents().not( this.element.add( this.icon ).add( this.iconSpace ) ).remove();
-		this.label.append( this.options.label );
-	},
-
-	refresh: function() {
-		var checked = this.element[ 0 ].checked,
-			isDisabled = this.element[ 0 ].disabled;
-
-		this._updateIcon( checked );
-		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
-		if ( this.options.label !== null ) {
-			this._updateLabel();
-		}
-
-		if ( isDisabled !== this.options.disabled ) {
-			this._setOptions( { "disabled": isDisabled } );
-		}
-	}
-
-} );
-
-return $.ui.checkboxradio;
-
-} ) );
diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index 34a2afa40..2e6cc1f3c 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -12,8 +12,7 @@
 //>>description: Enhances a form with themeable buttons.
 //>>docs: http://api.jqueryui.com/button/
 //>>demos: http://jqueryui.com/button/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/button.css
+//>>css.structure: ../themes/base/core.css, ../themes/base/button.css
 //>>css.theme: ../themes/base/theme.css
 
 ( function( factory ) {
diff --git a/ui/widgets/checkboxradio.js b/ui/widgets/checkboxradio.js
new file mode 100644
index 000000000..781274b9b
--- /dev/null
+++ b/ui/widgets/checkboxradio.js
@@ -0,0 +1,265 @@
+/*!
+ * jQuery UI Checkboxradio @VERSION
+ * http://jqueryui.com
+ *
+ * Copyright 2014 jQuery Foundation and other contributors
+ * Released under the MIT license.
+ * http://jquery.org/license
+ *
+ * http://api.jqueryui.com/checkboxradio/
+ */
+( function( factory ) {
+	if ( typeof define === "function" && define.amd ) {
+
+		// AMD. Register as an anonymous module.
+		define( [
+			"jquery",
+			"../escape-selector",
+			"../form-reset-mixin",
+			"../labels",
+			"../widget"
+		], factory );
+	} else {
+
+		// Browser globals
+		factory( jQuery );
+	}
+}( function( $ ) {
+
+$.widget( "ui.checkboxradio", [ $.ui.formResetMixin, {
+	version: "@VERSION",
+	options: {
+		disabled: null,
+		label: null,
+		icon: true,
+		classes: {
+			"ui-checkboxradio-label": "ui-corner-all",
+			"ui-checkboxradio-icon": "ui-corner-all"
+		}
+	},
+
+	_getCreateOptions: function() {
+		var disabled, labels,
+			that = this,
+			options = this._super() || {};
+
+		// We read the type here, because it makes more sense to throw a element type error first,
+		// rather then the error for lack of a label. Often if its the wrong type, it
+		// won't have a label (e.g. calling on a div, btn, etc)
+		this._readType();
+
+		labels = this.element.labels();
+
+		// Todo: For now we will use the last label we need to check about the best
+		// way to handle multiple labels with some accessability experts
+		this.label = $( labels[ labels.length - 1 ] );
+		if ( !this.label.length ) {
+			$.error( "No label found for checkboxradio widget" );
+		}
+
+		this.originalLabel = "";
+
+		// We need to get the label text but this may also need to make sure it does not contain the
+		// input itself.
+		this.label.contents().not( this.element ).each( function() {
+
+			// The label contents could be text html or a mix we concat each element to get a string
+			// representation of the label without the input as part of it.
+			that.originalLabel += this.nodeType === 3 ? $( this ).text() : this.outerHTML;
+		} );
+
+		// Set the label option if we found label text
+		if ( this.originalLabel ) {
+			options.label = this.originalLabel;
+		}
+
+		disabled = this.element[ 0 ].disabled;
+		if ( disabled != null ) {
+			options.disabled = disabled;
+		}
+		return options;
+	},
+
+	_create: function() {
+		var checked = this.element[ 0 ].checked;
+
+		this._bindFormResetHandler();
+
+		// this.form is set by the form-reset-mixin
+		this.formParent = this.form.length ? this.form : $( "body" );
+
+		if ( this.options.disabled == null ) {
+			this.options.disabled = this.element[ 0 ].disabled || false;
+		}
+
+		this._setOption( "disabled", this.options.disabled );
+		this._addClass( "ui-checkboxradio", "ui-helper-hidden-accessible" );
+		this._addClass( this.label, "ui-checkboxradio-label", "ui-button ui-widget" );
+
+		if ( this.type === "radio" ) {
+			this._addClass( this.label, "ui-checkboxradio-radio-label" );
+		}
+
+		if ( this.options.label && this.options.label !== this.originalLabel ) {
+			this._updateLabel();
+		} else if ( this.originalLabel ) {
+			this.options.label = this.originalLabel;
+		}
+
+		this._enhance();
+
+		if ( checked ) {
+			this._addClass( this.label, "ui-checkboxradio-checked", "ui-state-active" );
+			this._addClass( this.icon, null, "ui-state-hover" );
+		}
+
+		this._on( {
+			"change": "_toggleClasses",
+			"focus": function() {
+				this._addClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			},
+			"blur": function() {
+				this._removeClass( this.label, null, "ui-state-focus ui-visual-focus" );
+			}
+		} );
+	},
+
+	_readType: function() {
+		var nodeName = this.element[ 0 ].nodeName.toLowerCase();
+		this.type = this.element[ 0 ].type;
+		if ( nodeName !== "input" || !/radio|checkbox/.test( this.type ) ) {
+			$.error( "Can't create checkboxradio on element.nodeName=" + nodeName +
+				" and element.type=" + this.type );
+		}
+	},
+
+	// Support jQuery Mobile enhanced option
+	_enhance: function() {
+		this._updateIcon( this.element[ 0 ].checked );
+	},
+
+	widget: function() {
+		return this.label;
+	},
+
+	_getRadioGroup: function() {
+		var name = this.element[ 0 ].name,
+			that = this,
+			radios = $( [] );
+
+		if ( name ) {
+			name = $.ui.escapeSelector( name );
+			radios = this.formParent.find( "[name='" + $.ui.escapeSelector( name ) + "']" ).filter( function() {
+				var form = $( this ).form();
+				return ( form.length ? form : $( "body" ) )[ 0 ] === that.formParent[ 0 ];
+			} );
+		}
+		return radios.not( this.element );
+	},
+
+	_toggleClasses: function() {
+		var checked = this.element[ 0 ].checked;
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+
+		if ( this.options.icon && this.type === "checkbox" ) {
+
+			// We add ui-state-highlight to change the icon color
+			this._toggleClass( this.icon, null, "ui-icon-check ui-state-highlight", checked )
+				._toggleClass( this.icon, null, "ui-icon-blank", !checked );
+		}
+		if ( this.type === "radio" ) {
+			this._getRadioGroup()
+				.each( function() {
+					var instance = $( this ).checkboxradio( "instance" );
+
+					if ( instance ) {
+						instance._removeClass( instance.label,
+							"ui-checkboxradio-checked", "ui-state-active" );
+					}
+				} );
+		}
+	},
+
+	_destroy: function() {
+		this._unbindFormResetHandler();
+
+		if ( this.icon ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+		}
+	},
+
+	_setOption: function( key, value ) {
+
+		// We don't alow the value to be set to nothing
+		if ( key === "label" && !value ) {
+			return;
+		}
+
+		this._super( key, value );
+
+		if ( key === "disabled" ) {
+			this._toggleClass( this.label, null, "ui-state-disabled", value );
+			this.element[ 0 ].disabled = value;
+
+			// Don't refresh if disabled
+			return;
+		}
+		this.refresh();
+	},
+
+	_updateIcon: function( checked ) {
+		var toAdd = "ui-icon ui-icon-background ";
+
+		if ( this.options.icon ) {
+			if ( !this.icon ) {
+				this.icon = $( "<span>" );
+				this.iconSpace = $( "<span> </span>" );
+				this._addClass( this.iconSpace, "ui-checkboxradio-icon-space" );
+			}
+
+			if ( this.type === "checkbox" ) {
+				toAdd += checked ? "ui-icon-check" : "ui-icon-blank";
+				this._removeClass( this.icon, null, checked ? "ui-icon-blank" : "ui-icon-check" );
+			} else {
+				toAdd += "ui-icon-blank";
+			}
+			this._addClass( this.icon, "ui-checkboxradio-icon", toAdd );
+			if ( !checked ) {
+				this._removeClass( this.icon, null, "ui-icon-check" );
+			}
+			this.icon.prependTo( this.label ).after( this.iconSpace );
+		} else if ( this.icon !== undefined ) {
+			this.icon.remove();
+			this.iconSpace.remove();
+			delete this.icon;
+		}
+	},
+
+	_updateLabel: function() {
+
+		// Remove the contents of the label ( minus the icon, icon space, and input )
+		this.label.contents().not( this.element.add( this.icon ).add( this.iconSpace ) ).remove();
+		this.label.append( this.options.label );
+	},
+
+	refresh: function() {
+		var checked = this.element[ 0 ].checked,
+			isDisabled = this.element[ 0 ].disabled;
+
+		this._updateIcon( checked );
+		this._toggleClass( this.label, "ui-checkboxradio-checked", "ui-state-active", checked );
+		if ( this.options.label !== null ) {
+			this._updateLabel();
+		}
+
+		if ( isDisabled !== this.options.disabled ) {
+			this._setOptions( { "disabled": isDisabled } );
+		}
+	}
+
+} ] );
+
+return $.ui.checkboxradio;
+
+} ) );
diff --git a/ui/widgets/spinner.js b/ui/widgets/spinner.js
index f79b2baed..3a0b6deef 100644
--- a/ui/widgets/spinner.js
+++ b/ui/widgets/spinner.js
@@ -250,17 +250,19 @@ $.widget( "ui.spinner", {
 		// Button bindings
 		this.buttons = this.uiSpinner.children( "a" )
 			.attr( "tabIndex", -1 )
-			.button();
+			.button( {
+				classes: {
+					"ui-button": ""
+				}
+			} );
 
 		// TODO: Right now button does not support classes this is already updated in button PR
 		this._removeClass( this.buttons, "ui-corner-all" );
 
 		this._addClass( this.buttons.first(), "ui-spinner-button ui-spinner-up" );
 		this._addClass( this.buttons.last(), "ui-spinner-button ui-spinner-down" );
-		this._addClass( this.buttons.first().find( ".ui-button-text span" ), null,
-			"ui-icon " + this.options.icons.up );
-		this._addClass( this.buttons.last().find( ".ui-button-text span" ), null,
-			"ui-icon " + this.options.icons.down );
+		this.buttons.first().button( "option", "icon", this.options.icons.up );
+		this.buttons.last().button( "option", "icon", this.options.icons.down );
 
 		// IE 6 doesn't understand height: 50% for the buttons
 		// unless the wrapper has an explicit height
-- 
cgit v1.2.3


From 197061be5645fd3e9b521e63ecbd13630612d8c7 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Wed, 16 Sep 2015 01:48:03 -0400
Subject: Button: address review comments

---
 demos/button/icons.html              | 14 ++++----
 tests/visual/button/button.html      | 67 ------------------------------------
 tests/visual/button/performance.html | 21 -----------
 themes/base/button.css               |  2 +-
 ui/widgets/button.js                 |  3 +-
 5 files changed, 10 insertions(+), 97 deletions(-)
 delete mode 100644 tests/visual/button/button.html
 delete mode 100644 tests/visual/button/performance.html

(limited to 'ui/widgets/button.js')

diff --git a/demos/button/icons.html b/demos/button/icons.html
index af4e3000c..f3d4a3852 100644
--- a/demos/button/icons.html
+++ b/demos/button/icons.html
@@ -8,20 +8,20 @@
 	<link rel="stylesheet" href="../demos.css">
 	<script src="../../external/requirejs/require.js"></script>
 	<script src="../bootstrap.js">
-		$( ".widget button" ).first()
-			.button()
-			.next().button( {
+		$( ".widget button" )
+			.eq( 0 ).button()
+			.end().eq( 1 ).button( {
 				icon: "ui-icon-gear",
 				showLabel: false
-			} ).next().button( {
+			} ).end().eq( 2 ).button( {
 				icon: "ui-icon-gear"
-			} ).next().button( {
+			} ).end().eq( 3 ).button( {
 				icon: "ui-icon-gear",
 				iconPosition: "end"
-			} ).next().button( {
+			} ).end().eq( 4 ).button( {
 				icon: "ui-icon-gear",
 				iconPosition: "top"
-			} ).next().button( {
+			} ).end().eq( 5 ).button( {
 				icon: "ui-icon-gear",
 				iconPosition: "bottom"
 			} );
diff --git a/tests/visual/button/button.html b/tests/visual/button/button.html
deleted file mode 100644
index bb80d8a85..000000000
--- a/tests/visual/button/button.html
+++ /dev/null
@@ -1,67 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>Button Visual Test</title>
-	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../external/requirejs/require.js"></script>
-	<script src="../../../demos/bootstrap.js">
-		$( ".buttons" ).each(function() {
-			$( this ).children()
-				.eq( 0 )
-					.button({
-						showLabel: false,
-						icon:  "ui-icon-help"
-					})
-				.end()
-				.eq( 1 )
-					.button({
-						icon:  "ui-icon-help",
-						disabled: true
-					})
-				.end()
-				.eq( 2 )
-					.button();
-		});
-	</script>
-</head>
-<body>
-
-<div class="buttons">
-	<button>button</button>
-	<button>button</button>
-	<button>button</button>
-</div>
-
-<div class="buttons">
-	<button type="button">button button</button>
-	<button type="button">button button</button>
-	<button type="button">button button</button>
-</div>
-
-<div class="buttons">
-	<button type="submit">button submit</button>
-	<button type="submit">button submit</button>
-	<button type="submit">button submit</button>
-</div>
-
-<div class="buttons">
-	<input type="button" value="input button">
-	<input type="button" value="input button">
-	<input type="button" value="input button">
-</div>
-
-<div class="buttons">
-	<input type="submit" value="input submit">
-	<input type="submit" value="input submit">
-	<input type="submit" value="input submit">
-</div>
-
-<div class="buttons">
-	<a href="#">anchor</a>
-	<a href="#">anchor</a>
-	<a href="#">anchor</a>
-</div>
-
-</body>
-</html>
diff --git a/tests/visual/button/performance.html b/tests/visual/button/performance.html
deleted file mode 100644
index 0d807d167..000000000
--- a/tests/visual/button/performance.html
+++ /dev/null
@@ -1,21 +0,0 @@
-<!doctype html>
-<html lang="en">
-<head>
-	<meta charset="utf-8">
-	<title>Button Visual Test: Initialization Performance</title>
-	<link rel="stylesheet" href="../../../themes/base/all.css">
-	<script src="../../../external/requirejs/require.js"></script>
-	<script src="../../../demos/bootstrap.js">
-		var start,
-			html = new Array( 500 ).join( "<button>button</button>" );
-		$( html ).appendTo( "body" );
-
-		start = $.now();
-		$( "button" ).button();
-		$( "<p>" ).text( "Time to initialize: " + ($.now() - start)  + "ms" ).prependTo( "body" );
-	</script>
-</head>
-<body>
-
-</body>
-</html>
diff --git a/themes/base/button.css b/themes/base/button.css
index 599b5ea6a..4a3a57d48 100644
--- a/themes/base/button.css
+++ b/themes/base/button.css
@@ -74,7 +74,7 @@ input.ui-button.ui-icon-notext .ui-icon {
 }
 
 /* workarounds */
-/* Support: FireFox >= 4 */
+/* Support: Firefox 5 - 40 */
 input.ui-button::-moz-focus-inner,
 button.ui-button::-moz-focus-inner {
 	border: 0;
diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index 2e6cc1f3c..34a2afa40 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -12,7 +12,8 @@
 //>>description: Enhances a form with themeable buttons.
 //>>docs: http://api.jqueryui.com/button/
 //>>demos: http://jqueryui.com/button/
-//>>css.structure: ../themes/base/core.css, ../themes/base/button.css
+//>>css.structure: ../themes/base/core.css
+//>>css.structure: ../themes/base/button.css
 //>>css.theme: ../themes/base/theme.css
 
 ( function( factory ) {
-- 
cgit v1.2.3


From add78440f818c5164f346d016116872780541883 Mon Sep 17 00:00:00 2001
From: Alexander Schmitz <arschmitz@gmail.com>
Date: Wed, 30 Sep 2015 11:46:52 -0400
Subject: Button: Typos

---
 ui/widgets/button.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ui/widgets/button.js')

diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index 34a2afa40..bdba5bcb0 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -121,7 +121,9 @@ $.widget( "ui.button", {
 	},
 
 	_enhance: function() {
-		this.element.attr( "role", "button" );
+		if ( !this.element.is( "button" ) ) {
+			this.element.attr( "role", "button" );
+		}
 
 		if ( this.options.icon ) {
 			this._updateIcon( "icon", this.options.icon );
-- 
cgit v1.2.3


From cb69f0025f257c28ac3be39c4269373a9fa74002 Mon Sep 17 00:00:00 2001
From: Jörn Zaefferer <joern.zaefferer@gmail.com>
Date: Wed, 21 Oct 2015 19:08:44 -0400
Subject: All: Fix manifest issues for categories and CSS dependencies

Collapses "UI Core" and "Core" into just "Core".

Fixes bad paths for CSS dependencies. Regressed when moving widgets
into the widgets subfolder.
---
 ui/core.js                  | 2 +-
 ui/jquery-1-7.js            | 2 +-
 ui/position.js              | 2 +-
 ui/widget.js                | 2 +-
 ui/widgets/accordion.js     | 6 +++---
 ui/widgets/autocomplete.js  | 6 +++---
 ui/widgets/button.js        | 6 +++---
 ui/widgets/checkboxradio.js | 8 ++++----
 ui/widgets/controlgroup.js  | 6 +++---
 ui/widgets/datepicker.js    | 6 +++---
 ui/widgets/dialog.js        | 6 +++---
 ui/widgets/draggable.js     | 2 +-
 ui/widgets/menu.js          | 6 +++---
 ui/widgets/mouse.js         | 2 +-
 ui/widgets/progressbar.js   | 6 +++---
 ui/widgets/resizable.js     | 6 +++---
 ui/widgets/selectable.js    | 2 +-
 ui/widgets/selectmenu.js    | 6 +++---
 ui/widgets/slider.js        | 6 +++---
 ui/widgets/sortable.js      | 2 +-
 ui/widgets/spinner.js       | 6 +++---
 ui/widgets/tabs.js          | 6 +++---
 ui/widgets/tooltip.js       | 6 +++---
 23 files changed, 54 insertions(+), 54 deletions(-)

(limited to 'ui/widgets/button.js')

diff --git a/ui/core.js b/ui/core.js
index 8737993d9..9371976b4 100644
--- a/ui/core.js
+++ b/ui/core.js
@@ -9,7 +9,7 @@
  */
 
 //>>label: Core
-//>>group: UI Core
+//>>group: Core
 //>>description: The core of jQuery UI, required for all interactions and widgets.
 //>>docs: http://api.jqueryui.com/category/ui-core/
 
diff --git a/ui/jquery-1-7.js b/ui/jquery-1-7.js
index 8d25f8807..bd40e332f 100644
--- a/ui/jquery-1-7.js
+++ b/ui/jquery-1-7.js
@@ -9,7 +9,7 @@
  */
 
 //>>label: jQuery 1.7 Support
-//>>group: UI Core
+//>>group: Core
 //>>description: Support version 1.7.x of jQuery core
 
 ( function( factory ) {
diff --git a/ui/position.js b/ui/position.js
index 64f86173e..f8fa1b5db 100644
--- a/ui/position.js
+++ b/ui/position.js
@@ -10,7 +10,7 @@
  */
 
 //>>label: Position
-//>>group: UI Core
+//>>group: Core
 //>>description: Positions elements relative to other elements.
 //>>docs: http://api.jqueryui.com/position/
 //>>demos: http://jqueryui.com/position/
diff --git a/ui/widget.js b/ui/widget.js
index 1542cc88b..e38c0c871 100644
--- a/ui/widget.js
+++ b/ui/widget.js
@@ -8,7 +8,7 @@
  */
 
 //>>label: Widget
-//>>group: UI Core
+//>>group: Core
 //>>description: Provides a factory for creating stateful widgets with a common API.
 //>>docs: http://api.jqueryui.com/jQuery.widget/
 //>>demos: http://jqueryui.com/widget/
diff --git a/ui/widgets/accordion.js b/ui/widgets/accordion.js
index 360ac1700..14b3f7303 100644
--- a/ui/widgets/accordion.js
+++ b/ui/widgets/accordion.js
@@ -12,9 +12,9 @@
 //>>description: Displays collapsible content panels for presenting information in a limited amount of space.
 //>>docs: http://api.jqueryui.com/accordion/
 //>>demos: http://jqueryui.com/accordion/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/accordion.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/accordion.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/autocomplete.js b/ui/widgets/autocomplete.js
index 20d6d2fdd..060d8e94f 100644
--- a/ui/widgets/autocomplete.js
+++ b/ui/widgets/autocomplete.js
@@ -12,9 +12,9 @@
 //>>description: Lists suggested words as the user is typing.
 //>>docs: http://api.jqueryui.com/autocomplete/
 //>>demos: http://jqueryui.com/autocomplete/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/autocomplete.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/autocomplete.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index bdba5bcb0..2362a3b22 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -12,9 +12,9 @@
 //>>description: Enhances a form with themeable buttons.
 //>>docs: http://api.jqueryui.com/button/
 //>>demos: http://jqueryui.com/button/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/button.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/button.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/checkboxradio.js b/ui/widgets/checkboxradio.js
index 769ab146f..b4f4de49d 100644
--- a/ui/widgets/checkboxradio.js
+++ b/ui/widgets/checkboxradio.js
@@ -12,10 +12,10 @@
 //>>description: Enhances a form with multiple themeable checkboxes or radio buttons.
 //>>docs: http://api.jqueryui.com/checkboxradio/
 //>>demos: http://jqueryui.com/checkboxradio/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/button.css
-//>>css.structure: ../themes/base/checkboxradio.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/button.css
+//>>css.structure: ../../themes/base/checkboxradio.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/controlgroup.js b/ui/widgets/controlgroup.js
index 793874df5..536d480f9 100644
--- a/ui/widgets/controlgroup.js
+++ b/ui/widgets/controlgroup.js
@@ -12,9 +12,9 @@
 //>>description: Visually groups form control widgets
 //>>docs: http://api.jqueryui.com/controlgroup/
 //>>demos: http://jqueryui.com/controlgroup/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/controlgroup.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/controlgroup.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/datepicker.js b/ui/widgets/datepicker.js
index 4f14d7b23..f4631c6a7 100644
--- a/ui/widgets/datepicker.js
+++ b/ui/widgets/datepicker.js
@@ -13,9 +13,9 @@
 //>>description: Displays a calendar from an input or inline for selecting dates.
 //>>docs: http://api.jqueryui.com/datepicker/
 //>>demos: http://jqueryui.com/datepicker/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/datepicker.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/datepicker.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/dialog.js b/ui/widgets/dialog.js
index b143d291e..f0a2f6751 100644
--- a/ui/widgets/dialog.js
+++ b/ui/widgets/dialog.js
@@ -12,9 +12,9 @@
 //>>description: Displays customizable dialog windows.
 //>>docs: http://api.jqueryui.com/dialog/
 //>>demos: http://jqueryui.com/dialog/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/dialog.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/dialog.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/draggable.js b/ui/widgets/draggable.js
index b459afe00..7da09b7ec 100644
--- a/ui/widgets/draggable.js
+++ b/ui/widgets/draggable.js
@@ -12,7 +12,7 @@
 //>>description: Enables dragging functionality for any element.
 //>>docs: http://api.jqueryui.com/draggable/
 //>>demos: http://jqueryui.com/draggable/
-//>>css.structure: ../themes/base/draggable.css
+//>>css.structure: ../../themes/base/draggable.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/menu.js b/ui/widgets/menu.js
index d42d65bac..e7b13e7c9 100644
--- a/ui/widgets/menu.js
+++ b/ui/widgets/menu.js
@@ -12,9 +12,9 @@
 //>>description: Creates nestable menus.
 //>>docs: http://api.jqueryui.com/menu/
 //>>demos: http://jqueryui.com/menu/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/menu.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/menu.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/mouse.js b/ui/widgets/mouse.js
index 1d8458b27..30e5d35eb 100644
--- a/ui/widgets/mouse.js
+++ b/ui/widgets/mouse.js
@@ -8,7 +8,7 @@
  */
 
 //>>label: Mouse
-//>>group: UI Core
+//>>group: Widgets
 //>>description: Abstracts mouse-based interactions to assist in creating certain widgets.
 //>>docs: http://api.jqueryui.com/mouse/
 
diff --git a/ui/widgets/progressbar.js b/ui/widgets/progressbar.js
index 7e2695994..6afba892e 100644
--- a/ui/widgets/progressbar.js
+++ b/ui/widgets/progressbar.js
@@ -12,9 +12,9 @@
 //>>description: Displays a status indicator for loading state, standard percentage, and other progress indicators.
 //>>docs: http://api.jqueryui.com/progressbar/
 //>>demos: http://jqueryui.com/progressbar/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/progressbar.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/progressbar.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/resizable.js b/ui/widgets/resizable.js
index fcbab63ee..05ad72099 100644
--- a/ui/widgets/resizable.js
+++ b/ui/widgets/resizable.js
@@ -12,9 +12,9 @@
 //>>description: Enables resize functionality for any element.
 //>>docs: http://api.jqueryui.com/resizable/
 //>>demos: http://jqueryui.com/resizable/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/resizable.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/resizable.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/selectable.js b/ui/widgets/selectable.js
index 152729d7c..f3f144a81 100644
--- a/ui/widgets/selectable.js
+++ b/ui/widgets/selectable.js
@@ -12,7 +12,7 @@
 //>>description: Allows groups of elements to be selected with the mouse.
 //>>docs: http://api.jqueryui.com/selectable/
 //>>demos: http://jqueryui.com/selectable/
-//>>css.structure: ../themes/base/selectable.css
+//>>css.structure: ../../themes/base/selectable.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/selectmenu.js b/ui/widgets/selectmenu.js
index e57354f2e..a4e757be1 100644
--- a/ui/widgets/selectmenu.js
+++ b/ui/widgets/selectmenu.js
@@ -12,9 +12,9 @@
 //>>description: Duplicates and extends the functionality of a native HTML select element, allowing it to be customizable in behavior and appearance far beyond the limitations of a native select.
 //>>docs: http://api.jqueryui.com/selectmenu/
 //>>demos: http://jqueryui.com/selectmenu/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/selectmenu.css, ../themes/base/button.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/selectmenu.css, ../../themes/base/button.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/slider.js b/ui/widgets/slider.js
index 8b8a7292a..a2da892c4 100644
--- a/ui/widgets/slider.js
+++ b/ui/widgets/slider.js
@@ -12,9 +12,9 @@
 //>>description: Displays a flexible slider with ranges and accessibility via keyboard.
 //>>docs: http://api.jqueryui.com/slider/
 //>>demos: http://jqueryui.com/slider/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/slider.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/slider.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/sortable.js b/ui/widgets/sortable.js
index 423bb81f8..8920ed967 100644
--- a/ui/widgets/sortable.js
+++ b/ui/widgets/sortable.js
@@ -12,7 +12,7 @@
 //>>description: Enables items in a list to be sorted using the mouse.
 //>>docs: http://api.jqueryui.com/sortable/
 //>>demos: http://jqueryui.com/sortable/
-//>>css.structure: ../themes/base/sortable.css
+//>>css.structure: ../../themes/base/sortable.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/spinner.js b/ui/widgets/spinner.js
index b89c9d3ad..e875f10ad 100644
--- a/ui/widgets/spinner.js
+++ b/ui/widgets/spinner.js
@@ -12,9 +12,9 @@
 //>>description: Displays buttons to easily input numbers via the keyboard or mouse.
 //>>docs: http://api.jqueryui.com/spinner/
 //>>demos: http://jqueryui.com/spinner/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/spinner.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/spinner.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/tabs.js b/ui/widgets/tabs.js
index baece431d..a35386541 100644
--- a/ui/widgets/tabs.js
+++ b/ui/widgets/tabs.js
@@ -12,9 +12,9 @@
 //>>description: Transforms a set of container elements into a tab structure.
 //>>docs: http://api.jqueryui.com/tabs/
 //>>demos: http://jqueryui.com/tabs/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/tabs.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/tabs.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
diff --git a/ui/widgets/tooltip.js b/ui/widgets/tooltip.js
index 1bff57c8f..94021092a 100644
--- a/ui/widgets/tooltip.js
+++ b/ui/widgets/tooltip.js
@@ -12,9 +12,9 @@
 //>>description: Shows additional information for any element on hover or focus.
 //>>docs: http://api.jqueryui.com/tooltip/
 //>>demos: http://jqueryui.com/tooltip/
-//>>css.structure: ../themes/base/core.css
-//>>css.structure: ../themes/base/tooltip.css
-//>>css.theme: ../themes/base/theme.css
+//>>css.structure: ../../themes/base/core.css
+//>>css.structure: ../../themes/base/tooltip.css
+//>>css.theme: ../../themes/base/theme.css
 
 ( function( factory ) {
 	if ( typeof define === "function" && define.amd ) {
-- 
cgit v1.2.3


From 5d7e8b1824416f013339f5ba55169f1bcd5bd46c Mon Sep 17 00:00:00 2001
From: Scott González <scott.gonzalez@gmail.com>
Date: Mon, 26 Oct 2015 16:58:46 -0400
Subject: Button: Fix call to `._toggleClass()`

---
 ui/widgets/button.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'ui/widgets/button.js')

diff --git a/ui/widgets/button.js b/ui/widgets/button.js
index 2362a3b22..50da9f9e2 100644
--- a/ui/widgets/button.js
+++ b/ui/widgets/button.js
@@ -238,7 +238,7 @@ $.widget( "ui.button", {
 
 		// Make sure we can't end up with a button that has neither text nor icon
 		if ( key === "showLabel" ) {
-				this._toggleClass( this._classes( "ui-button-icon-only" ), null, !value );
+				this._toggleClass( "ui-button-icon-only", null, !value );
 				this._updateTooltip();
 		}
 
-- 
cgit v1.2.3