jquery-ui-rails 4.2.1 → 5.0.0

data/History.md

@@ -1,5 +1,11 @@
 # master
 
+# 5.0.0
+
+* Update to jQuery UI 1.11.0
+* Rename `jquery.ui.*.{js,css}` to `jquery-ui/*.{js,css}`
+* Add jquery-ui.js and jquery-ui.css assets
+
 # 4.2.1
 
 * Update to jQuery UI 1.10.4

data/README.md

@@ -16,9 +16,10 @@ Also check out the
 [jquery-ui-sass-rails](https://github.com/jhilden/jquery-ui-sass-rails) gem,
 which allows you to override theme variables with Sass.
 
-*Note: As of version 4.0.5, jquery-ui-rails has dropped its unused dependency
-on the `jquery-rails` gem. If you get an error "couldn't find file 'jquery'",
-you may need to explicitly add `gem 'jquery-rails'` to your Gemfile.*
+Warning: This gem is incompatible with the `jquery-rails` gem before version
+3.0.0! Strange things will happen if you use an earlier `jquery-rails`
+version. Run `bundle list` to ensure that you either aren't using
+`jquery-rails`, or at least version 3.0.0 of `jquery-rails`.
 
 ## Usage
 
@@ -33,14 +34,14 @@ gem 'jquery-ui-rails'
 To require all jQuery UI modules, add the following to your application.js:
 
 ```javascript
-//= require jquery.ui.all
+//= require jquery-ui
 ```
 
 Also add the jQuery UI CSS to your application.css:
 
 ```css
 /*
- *= require jquery.ui.all
+ *= require jquery-ui
  */
 ```
 
@@ -65,14 +66,14 @@ For example, if you only need the datepicker module, add this to your
 application.js:
 
 ```javascript
-//= require jquery.ui.datepicker
+//= require jquery-ui/datepicker
 ```
 
 In your application.css, require the corresponding CSS module:
 
 ```css
 /*
- *= require jquery.ui.datepicker
+ *= require jquery-ui/datepicker
  */
 ```
 
@@ -81,10 +82,10 @@ In your application.css, require the corresponding CSS module:
 ### UI Core
 
 ```javascript
-//= require jquery.ui.core
-//= require jquery.ui.widget
-//= require jquery.ui.mouse
-//= require jquery.ui.position
+//= require jquery-ui/core
+//= require jquery-ui/widget
+//= require jquery-ui/mouse
+//= require jquery-ui/position
 ```
 
 You usually do not need to require these directly, as they are pulled in by the
@@ -93,30 +94,31 @@ other JavaScript modules as needed.
 ### Interactions
 
 ```javascript
-//= require jquery.ui.draggable
-//= require jquery.ui.droppable
-//= require jquery.ui.resizable
-//= require jquery.ui.selectable
-//= require jquery.ui.sortable
+//= require jquery-ui/draggable
+//= require jquery-ui/droppable
+//= require jquery-ui/resizable
+//= require jquery-ui/selectable
+//= require jquery-ui/sortable
 ```
 
-For `jquery.ui.resizable` and `jquery.ui.selectable`, remember to `require`
-their matching CSS files in your application.css as well.
+For all but `jquery-ui/droppable`, remember to `require` their matching CSS
+files in your application.css as well.
 
 ### Widgets
 
 ```javascript
-//= require jquery.ui.accordion
-//= require jquery.ui.autocomplete
-//= require jquery.ui.button
-//= require jquery.ui.datepicker
-//= require jquery.ui.dialog
-//= require jquery.ui.menu
-//= require jquery.ui.progressbar
-//= require jquery.ui.slider
-//= require jquery.ui.spinner
-//= require jquery.ui.tabs
-//= require jquery.ui.tooltip
+//= require jquery-ui/accordion
+//= require jquery-ui/autocomplete
+//= require jquery-ui/button
+//= require jquery-ui/datepicker
+//= require jquery-ui/dialog
+//= require jquery-ui/menu
+//= require jquery-ui/progressbar
+//= require jquery-ui/selectmenu
+//= require jquery-ui/slider
+//= require jquery-ui/spinner
+//= require jquery-ui/tabs
+//= require jquery-ui/tooltip
 ```
 
 For all of these, remember to `require` their matching CSS files in your
@@ -125,13 +127,13 @@ application.css as well.
 #### I18n
 
 Datepicker has optional i18n modules for non-US locales, named
-`jquery.ui.datepicker-xx[-YY]`
+`jquery-ui/datepicker-xx[-YY]`
 ([list](https://github.com/joliss/jquery-ui-rails/tree/master/app/assets/javascripts)),
 for example:
 
 ```javascript
-//= require jquery.ui.datepicker
-//= require jquery.ui.datepicker-pt-BR
+//= require jquery-ui/datepicker
+//= require jquery-ui/datepicker-pt-BR
 ```
 
 Note that you still need to include the main datepicker module. It is not
@@ -141,21 +143,23 @@ reasons](https://github.com/joliss/jquery-ui-rails/issues/9#issuecomment-6524987
 ### Effects
 
 ```javascript
-//= require jquery.ui.effect.all
-//= require jquery.ui.effect
-//= require jquery.ui.effect-blind
-//= require jquery.ui.effect-bounce
-//= require jquery.ui.effect-clip
-//= require jquery.ui.effect-drop
-//= require jquery.ui.effect-explode
-//= require jquery.ui.effect-fade
-//= require jquery.ui.effect-fold
-//= require jquery.ui.effect-highlight
-//= require jquery.ui.effect-pulsate
-//= require jquery.ui.effect-scale
-//= require jquery.ui.effect-shake
-//= require jquery.ui.effect-slide
-//= require jquery.ui.effect-transfer
+//= require jquery-ui/effect.all
+//= require jquery-ui/effect
+//= require jquery-ui/effect-blind
+//= require jquery-ui/effect-bounce
+//= require jquery-ui/effect-clip
+//= require jquery-ui/effect-drop
+//= require jquery-ui/effect-explode
+//= require jquery-ui/effect-fade
+//= require jquery-ui/effect-fold
+//= require jquery-ui/effect-highlight
+//= require jquery-ui/effect-puff
+//= require jquery-ui/effect-pulsate
+//= require jquery-ui/effect-scale
+//= require jquery-ui/effect-shake
+//= require jquery-ui/effect-size
+//= require jquery-ui/effect-slide
+//= require jquery-ui/effect-transfer
 ```
 
 ## Stylesheet Assets
@@ -164,8 +168,8 @@ reasons](https://github.com/joliss/jquery-ui-rails/issues/9#issuecomment-6524987
 
 ```css
 /*
- *= require jquery.ui.core
- *= require jquery.ui.theme
+ *= require jquery-ui/core
+ *= require jquery-ui/theme
  */
 ```
 
@@ -177,8 +181,10 @@ pulled in as dependencies.
 
 ```css
 /*
- *= require jquery.ui.resizable
- *= require jquery.ui.selectable
+ *= require jquery-ui/draggable
+ *= require jquery-ui/resizable
+ *= require jquery-ui/selectable
+ *= require jquery-ui/sortable
  */
 ```
 
@@ -186,17 +192,18 @@ pulled in as dependencies.
 
 ```css
 /*
- *= require jquery.ui.accordion
- *= require jquery.ui.autocomplete
- *= require jquery.ui.button
- *= require jquery.ui.datepicker
- *= require jquery.ui.dialog
- *= require jquery.ui.menu
- *= require jquery.ui.progressbar
- *= require jquery.ui.slider
- *= require jquery.ui.spinner
- *= require jquery.ui.tabs
- *= require jquery.ui.tooltip
+ *= require jquery-ui/accordion
+ *= require jquery-ui/autocomplete
+ *= require jquery-ui/button
+ *= require jquery-ui/datepicker
+ *= require jquery-ui/dialog
+ *= require jquery-ui/menu
+ *= require jquery-ui/progressbar
+ *= require jquery-ui/selectmenu
+ *= require jquery-ui/slider
+ *= require jquery-ui/spinner
+ *= require jquery-ui/tabs
+ *= require jquery-ui/tooltip
  */
 ```
 
@@ -281,14 +288,3 @@ Now point your browser at [http://localhost:3000/](http://localhost:3000/).
     (This is arguably cumbersome, not officially supported by this gem, and
     adds 1 KB overhead as both the base theme and the custom theme are served
     up.)
-
-*   The `jquery.ui.all.js` file is named `jquery-ui.js` in the official
-    distribution. We should follow their naming. But jquery-rails provides a
-    `jquery-ui.js` asset as well, so until that is removed from the
-    jquery-rails gem (see issue
-    [#46](https://github.com/rails/jquery-rails/issues/46)), we cannot
-    distribute `jquery-ui.js` without risking conflicts.
-
-    To reduce confusion, as long as there is no `jquery-ui.js`, we also do not
-    distribute the official `jquery-ui-i18n.js` and `jquery-ui.css`. The latter
-    is available as `jquery.ui.all.css` however.

data/Rakefile

@@ -3,9 +3,9 @@ require 'json'
 require 'bundler/gem_tasks'
 
 # returns the source filename for a given JSON build file
-# (e.g., "ui.core.jquery.json" returns "jquery.ui.core.js")
+# (e.g., "ui.core.jquery.json" returns "core.js")
 def source_file_for_build_file(build_file)
-  "jquery.#{build_file.sub('.jquery.json', '')}.js"
+  "#{build_file.sub('ui.', '').sub('.jquery.json', '')}.js"
 end
 
 # returns the source filename for a named file in the 'dependencies'
@@ -27,7 +27,7 @@ def source_file_for_dependency_entry(dep_entry)
   return "jquery.js" if dep_entry == 'jquery'
 
   # otherwise, tack 'jquery.' on the front
-  "jquery.#{dep_entry}.js"
+  "#{dep_entry.sub 'ui.', ''}.js"
 end
 
 # return a Hash of dependency info, whose keys are jquery-ui
@@ -52,7 +52,9 @@ def map_dependencies
   dependencies
 end
 
-DEPENDENCY_HASH = map_dependencies
+def dependency_hash
+  @dependency_hash ||= map_dependencies
+end
 
 def version
   JSON.load(File.read('jquery-ui/package.json'))['version']
@@ -63,7 +65,7 @@ task :submodule do
 end
 
 def get_js_dependencies(basename)
-  dependencies = DEPENDENCY_HASH[basename]
+  dependencies = dependency_hash[basename]
   if dependencies.nil?
     puts "Warning: No dependencies found for #{basename}"
     dependencies = []
@@ -105,14 +107,15 @@ task :javascripts => :submodule do
   Rake.rake_output_message 'Generating javascripts'
 
   target_dir = "app/assets/javascripts"
-  mkdir_p target_dir
+  target_ui_dir = "#{target_dir}/jquery-ui"
+  mkdir_p target_ui_dir
 
   Dir.glob("jquery-ui/ui/*.js").each do |path|
     basename = File.basename(path)
     dep_modules = get_js_dependencies(basename).map(&method(:remove_js_extension))
-    File.open("#{target_dir}/#{basename}", "w") do |out|
+    File.open("#{target_ui_dir}/#{basename}", "w") do |out|
       dep_modules.each do |mod|
-        out.write("//= require #{mod}\n")
+        out.write("//= require jquery-ui/#{mod}\n")
       end
       out.write("\n") unless dep_modules.empty?
       source_code = File.read(path)
@@ -126,7 +129,7 @@ task :javascripts => :submodule do
   # https://github.com/joliss/jquery-ui-rails/issues/9
   Dir.glob("jquery-ui/ui/i18n/*.js").each do |path|
     basename = File.basename(path)
-    File.open("#{target_dir}/#{basename}", "w") do |out|
+    File.open("#{target_ui_dir}/#{basename}", "w") do |out|
       source_code = File.read(path)
       source_code.gsub!('@VERSION', version)
       protect_copyright_notice(source_code)
@@ -134,16 +137,16 @@ task :javascripts => :submodule do
     end
   end
 
-  File.open("#{target_dir}/jquery.ui.effect.all.js", "w") do |out|
-    Dir.glob("jquery-ui/ui/jquery.ui.effect*.js").sort.each do |path|
+  File.open("#{target_ui_dir}/effect.all.js", "w") do |out|
+    Dir.glob("jquery-ui/ui/effect*.js").sort.each do |path|
       asset_name = remove_js_extension(File.basename(path))
-      out.write("//= require #{asset_name}\n")
+      out.write("//= require jquery-ui/#{asset_name}\n")
     end
   end
-  File.open("#{target_dir}/jquery.ui.all.js", "w") do |out|
+  File.open("#{target_dir}/jquery-ui.js", "w") do |out|
     Dir.glob("jquery-ui/ui/*.js").sort.each do |path|
       asset_name = remove_js_extension(File.basename(path))
-      out.write("//= require #{asset_name}\n")
+      out.write("//= require jquery-ui/#{asset_name}\n")
     end
   end
 end
@@ -153,7 +156,12 @@ task :stylesheets => :submodule do
   Rake.rake_output_message 'Generating stylesheets'
 
   target_dir = "app/assets/stylesheets"
-  mkdir_p target_dir
+  target_ui_dir = "#{target_dir}/jquery-ui"
+  mkdir_p target_ui_dir
+
+  File.open("#{target_dir}/jquery-ui.css", "w") do |out|
+    out.write("//= require jquery-ui/all\n")
+  end
 
   css_dir = "jquery-ui/themes/base"
   Dir.glob("#{css_dir}/*.css").each do |path|
@@ -164,35 +172,31 @@ task :stylesheets => :submodule do
     extra_dependencies = []
     # Is "theme" listed among the dependencies for the matching JS file?
     unless basename =~ /\.(all|base|core)\./
-      dependencies = DEPENDENCY_HASH[basename.sub(/\.css/, '.js')]
-      if dependencies.nil?
-        puts "Warning: No matching JavaScript dependencies found for #{basename}"
-        extra_dependencies << 'jquery.ui.core'
-      else
+      if dependencies = dependency_hash[basename.sub(/\.css/, '.js')]
         dependencies.each do |dependency|
           dependency = dependency.sub(/\.js$/, '')
           dependent_stylesheet = "#{dependency}.css"
           extra_dependencies << dependency if File.exists?("#{css_dir}/#{dependent_stylesheet}")
         end
-        extra_dependencies << 'jquery.ui.theme'
+        extra_dependencies << 'theme'
       end
     end
     extra_dependencies.reverse.each do |dep|
       # Add after first comment block
-      source_code = source_code.sub(/\A((.*?\*\/\n)?)/m, "\\1/*\n *= require #{dep}\n */\n")
+      source_code = source_code.sub(/\A((.*?\*\/\n)?)/m, "\\1/*\n *= require jquery-ui/#{dep}\n */\n")
     end
     # Use "require" instead of @import
     source_code.gsub!(/^@import (.*)$/) { |s|
       m = s.match(/^@import (url\()?"(?<module>[-_.a-zA-Z]+)\.css"\)?;/) \
         or fail "Cannot parse import: #{s}"
-      "/*\n *= require #{m['module']}\n */"
+      "/*\n *= require jquery-ui/#{m['module']}\n */"
     }
     # Be cute: collapse multiple require comment blocks into one
     source_code.gsub!(/^( \*= require .*)\n \*\/(\n+)\/\*\n(?= \*= require )/, '\1\2')
     source_code.gsub!(/\A(\/\*!.+?\*\/\s)/m, "\\1\n/*\n#{build_image_dependencies(source_code)} */\n\n") unless build_image_dependencies(source_code).empty?
     # Replace hard-coded image URLs with asset path helpers
     source_code.gsub!(/url\("?images\/([-_.a-zA-Z0-9]+)"?\)/, 'url(<%= image_path("jquery-ui/\1") %>)')
-    File.open("#{target_dir}/#{basename}.erb", "w") do |out|
+    File.open("#{target_ui_dir}/#{basename}.erb", "w") do |out|
       out.write(source_code)
     end
   end

data/VERSIONS.md

@@ -2,6 +2,7 @@
 
 | Gem    | jQuery UI |
 |--------|-----------|
+| 5.0.0  | 1.11.0    |
 | 4.2.1  | 1.10.4    |
 | 4.2.0  | 1.10.3    |
 | 4.1.2  | 1.10.3    |

data/app/assets/javascripts/jquery-ui.js

@@ -0,0 +1,37 @@
+//= require jquery-ui/accordion
+//= require jquery-ui/autocomplete
+//= require jquery-ui/button
+//= require jquery-ui/core
+//= require jquery-ui/datepicker
+//= require jquery-ui/dialog
+//= require jquery-ui/draggable
+//= require jquery-ui/droppable
+//= require jquery-ui/effect-blind
+//= require jquery-ui/effect-bounce
+//= require jquery-ui/effect-clip
+//= require jquery-ui/effect-drop
+//= require jquery-ui/effect-explode
+//= require jquery-ui/effect-fade
+//= require jquery-ui/effect-fold
+//= require jquery-ui/effect-highlight
+//= require jquery-ui/effect-puff
+//= require jquery-ui/effect-pulsate
+//= require jquery-ui/effect-scale
+//= require jquery-ui/effect-shake
+//= require jquery-ui/effect-size
+//= require jquery-ui/effect-slide
+//= require jquery-ui/effect-transfer
+//= require jquery-ui/effect
+//= require jquery-ui/menu
+//= require jquery-ui/mouse
+//= require jquery-ui/position
+//= require jquery-ui/progressbar
+//= require jquery-ui/resizable
+//= require jquery-ui/selectable
+//= require jquery-ui/selectmenu
+//= require jquery-ui/slider
+//= require jquery-ui/sortable
+//= require jquery-ui/spinner
+//= require jquery-ui/tabs
+//= require jquery-ui/tooltip
+//= require jquery-ui/widget

data/app/assets/javascripts/{jquery.ui.accordion.js → jquery-ui/accordion.js}

@@ -1,8 +1,8 @@
-//= require jquery.ui.core
-//= require jquery.ui.widget
+//= require jquery-ui/core
+//= require jquery-ui/widget
 
 /*!
- * jQuery UI Accordion 1.10.4
+ * jQuery UI Accordion 1.11.0
  * http://jqueryui.com
  *
  * Copyright 2014 jQuery Foundation and other contributors
@@ -10,24 +10,25 @@
  * http://jquery.org/license
  *
  * http://api.jqueryui.com/accordion/
- *
- * Depends:
- *	jquery.ui.core.js
- *	jquery.ui.widget.js
  */
-(function( $, undefined ) {
-
-var uid = 0,
-	hideProps = {},
-	showProps = {};
-
-hideProps.height = hideProps.paddingTop = hideProps.paddingBottom =
-	hideProps.borderTopWidth = hideProps.borderBottomWidth = "hide";
-showProps.height = showProps.paddingTop = showProps.paddingBottom =
-	showProps.borderTopWidth = showProps.borderBottomWidth = "show";
+(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( $ ) {
 
-$.widget( "ui.accordion", {
-	version: "1.10.4",
+return $.widget( "ui.accordion", {
+	version: "1.11.0",
 	options: {
 		active: 0,
 		animate: {},
@@ -45,6 +46,22 @@ $.widget( "ui.accordion", {
 		beforeActivate: null
 	},
 
+	hideProps: {
+		borderTopWidth: "hide",
+		borderBottomWidth: "hide",
+		paddingTop: "hide",
+		paddingBottom: "hide",
+		height: "hide"
+	},
+
+	showProps: {
+		borderTopWidth: "show",
+		borderBottomWidth: "show",
+		paddingTop: "show",
+		paddingBottom: "show",
+		height: "show"
+	},
+
 	_create: function() {
 		var options = this.options;
 		this.prevShow = this.prevHide = $();
@@ -68,8 +85,7 @@ $.widget( "ui.accordion", {
 	_getCreateEventData: function() {
 		return {
 			header: this.active,
-			panel: !this.active.length ? $() : this.active.next(),
-			content: !this.active.length ? $() : this.active.next()
+			panel: !this.active.length ? $() : this.active.next()
 		};
 	},
 
@@ -103,31 +119,27 @@ $.widget( "ui.accordion", {
 
 		// clean up headers
 		this.headers
-			.removeClass( "ui-accordion-header ui-accordion-header-active ui-helper-reset ui-state-default ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
+			.removeClass( "ui-accordion-header ui-accordion-header-active ui-state-default " +
+				"ui-corner-all ui-state-active ui-state-disabled ui-corner-top" )
 			.removeAttr( "role" )
 			.removeAttr( "aria-expanded" )
 			.removeAttr( "aria-selected" )
 			.removeAttr( "aria-controls" )
 			.removeAttr( "tabIndex" )
-			.each(function() {
-				if ( /^ui-accordion/.test( this.id ) ) {
-					this.removeAttribute( "id" );
-				}
-			});
+			.removeUniqueId();
+
 		this._destroyIcons();
 
 		// clean up content panels
 		contents = this.headers.next()
+			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom " +
+				"ui-accordion-content ui-accordion-content-active ui-state-disabled" )
 			.css( "display", "" )
 			.removeAttr( "role" )
 			.removeAttr( "aria-hidden" )
 			.removeAttr( "aria-labelledby" )
-			.removeClass( "ui-helper-reset ui-widget-content ui-corner-bottom ui-accordion-content ui-accordion-content-active ui-state-disabled" )
-			.each(function() {
-				if ( /^ui-accordion/.test( this.id ) ) {
-					this.removeAttribute( "id" );
-				}
-			});
+			.removeUniqueId();
+
 		if ( this.options.heightStyle !== "content" ) {
 			contents.css( "height", "" );
 		}
@@ -164,6 +176,9 @@ $.widget( "ui.accordion", {
 		// #5332 - opacity doesn't cascade to positioned elements in IE
 		// so we need to add the disabled class to the headers and panels
 		if ( key === "disabled" ) {
+			this.element
+				.toggleClass( "ui-state-disabled", !!value )
+				.attr( "aria-disabled", value );
 			this.headers.add( this.headers.next() )
 				.toggleClass( "ui-state-disabled", !!value );
 		}
@@ -208,7 +223,7 @@ $.widget( "ui.accordion", {
 		}
 	},
 
-	_panelKeyDown : function( event ) {
+	_panelKeyDown: function( event ) {
 		if ( event.keyCode === $.ui.keyCode.UP && event.ctrlKey ) {
 			$( event.currentTarget ).prev().focus();
 		}
@@ -248,11 +263,11 @@ $.widget( "ui.accordion", {
 
 	_processPanels: function() {
 		this.headers = this.element.find( this.options.header )
-			.addClass( "ui-accordion-header ui-helper-reset ui-state-default ui-corner-all" );
+			.addClass( "ui-accordion-header ui-state-default ui-corner-all" );
 
 		this.headers.next()
 			.addClass( "ui-accordion-content ui-helper-reset ui-widget-content ui-corner-bottom" )
-			.filter(":not(.ui-accordion-content-active)")
+			.filter( ":not(.ui-accordion-content-active)" )
 			.hide();
 	},
 
@@ -260,9 +275,7 @@ $.widget( "ui.accordion", {
 		var maxHeight,
 			options = this.options,
 			heightStyle = options.heightStyle,
-			parent = this.element.parent(),
-			accordionId = this.accordionId = "ui-accordion-" +
-				(this.element.attr( "id" ) || ++uid);
+			parent = this.element.parent();
 
 		this.active = this._findActive( options.active )
 			.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
@@ -273,19 +286,11 @@ $.widget( "ui.accordion", {
 
 		this.headers
 			.attr( "role", "tab" )
-			.each(function( i ) {
+			.each(function() {
 				var header = $( this ),
-					headerId = header.attr( "id" ),
+					headerId = header.uniqueId().attr( "id" ),
 					panel = header.next(),
-					panelId = panel.attr( "id" );
-				if ( !headerId ) {
-					headerId = accordionId + "-header-" + i;
-					header.attr( "id", headerId );
-				}
-				if ( !panelId ) {
-					panelId = accordionId + "-panel-" + i;
-					panel.attr( "id", panelId );
-				}
+					panelId = panel.uniqueId().attr( "id" );
 				header.attr( "aria-controls", panelId );
 				panel.attr( "aria-labelledby", headerId );
 			})
@@ -383,7 +388,7 @@ $.widget( "ui.accordion", {
 			keydown: "_keydown"
 		};
 		if ( event ) {
-			$.each( event.split(" "), function( index, eventName ) {
+			$.each( event.split( " " ), function( index, eventName ) {
 				events[ eventName ] = "_eventHandler";
 			});
 		}
@@ -521,14 +526,14 @@ $.widget( "ui.accordion", {
 		duration = duration || options.duration || animate.duration;
 
 		if ( !toHide.length ) {
-			return toShow.animate( showProps, duration, easing, complete );
+			return toShow.animate( this.showProps, duration, easing, complete );
 		}
 		if ( !toShow.length ) {
-			return toHide.animate( hideProps, duration, easing, complete );
+			return toHide.animate( this.hideProps, duration, easing, complete );
 		}
 
 		total = toShow.show().outerHeight();
-		toHide.animate( hideProps, {
+		toHide.animate( this.hideProps, {
 			duration: duration,
 			easing: easing,
 			step: function( now, fx ) {
@@ -537,7 +542,7 @@ $.widget( "ui.accordion", {
 		});
 		toShow
 			.hide()
-			.animate( showProps, {
+			.animate( this.showProps, {
 				duration: duration,
 				easing: easing,
 				complete: complete,
@@ -564,10 +569,10 @@ $.widget( "ui.accordion", {
 
 		// Work around for rendering bug in IE (#5421)
 		if ( toHide.length ) {
-			toHide.parent()[0].className = toHide.parent()[0].className;
+			toHide.parent()[ 0 ].className = toHide.parent()[ 0 ].className;
 		}
 		this._trigger( "activate", null, data );
 	}
 });
 
-})( jQuery );
+}));