jquery-ui-rails 4.0.0 → 4.2.1

data/.travis.yml

@@ -1,3 +1,2 @@
 rvm:
-  - 1.9.2
   - 1.9.3

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
 gemspec

data/History.md

@@ -1,5 +1,49 @@
 # master
 
+# 4.2.1
+
+* Update to jQuery UI 1.10.4
+
+# 4.2.0
+
+* Bump Rails dependency to `>=3.2.16`
+* Re-release 4.1.1 as 4.2.0
+
+# 4.1.2
+
+* Re-release 4.1.0 as 4.1.2; last version compatible with Rails 3.1
+
+# 4.1.1
+
+* Declare image dependencies using `//= depend_on_asset`, to stop the
+  Sprockets cache from going stale.
+
+# 4.1.0
+
+* Add Jquery::Ui::Rails::JQUERY_UI_VERSION constant
+
+# 4.0.5
+
+* Remove 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.
+
+# 4.0.4
+
+* Include license in gemspec
+
+# 4.0.3
+
+* Upgrade to jQuery UI 1.10.3
+
+# 4.0.2
+
+* Rails 4 compatibility
+
+# 4.0.1
+
+* Add missing animated-overlay.gif asset and fix image path
+
 # 4.0.0
 
 * Upgrade to jQuery UI 1.10.0

data/README.md

@@ -1,13 +1,25 @@
 # jquery-ui-rails
 
-[![Build Status](https://secure.travis-ci.org/joliss/jquery-ui-rails.png?branch=master)](http://travis-ci.org/joliss/jquery-ui-rails) [![Dependency Status](https://gemnasium.com/joliss/jquery-ui-rails.png)](https://gemnasium.com/joliss/jquery-ui-rails)
+[![Build Status](https://secure.travis-ci.org/joliss/jquery-ui-rails.png?branch=master)](http://travis-ci.org/joliss/jquery-ui-rails)
+[![Dependency Status](https://gemnasium.com/joliss/jquery-ui-rails.png)](https://gemnasium.com/joliss/jquery-ui-rails)
 
-This gem packages the jQuery UI 1.10.0 assets (JavaScripts, stylesheets, and
-images) for the Rails 3.1+ [asset
+This gem packages the jQuery UI assets (JavaScripts, stylesheets, and
+images) for the Rails [asset
 pipeline](http://guides.rubyonrails.org/asset_pipeline.html), so you never have
 to download a custom package through the [web
 interface](http://jqueryui.com/download) again.
 
+See [VERSIONS.md](VERSIONS.md) to see which versions of jquery-ui-rails bundle
+which versions of jQuery UI.
+
+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.*
+
 ## Usage
 
 In your Gemfile, add:
@@ -114,7 +126,7 @@ application.css as well.
 
 Datepicker has optional i18n modules for non-US locales, named
 `jquery.ui.datepicker-xx[-YY]`
-([list](https://github.com/joliss/jquery-ui-rails/tree/master/vendor/assets/javascripts)),
+([list](https://github.com/joliss/jquery-ui-rails/tree/master/app/assets/javascripts)),
 for example:
 
 ```javascript

data/Rakefile

@@ -1,3 +1,4 @@
+Encoding.default_external = "UTF-8" if defined?(Encoding)
 require 'json'
 require 'bundler/gem_tasks'
 
@@ -87,16 +88,25 @@ def protect_copyright_notice(source_code)
   source_code.gsub!(/\A\s*\/\*\r?\n/, "/*!\n")
 end
 
-desc "Remove the vendor directory"
+def build_image_dependencies(source_code)
+  image_dependencies = Set.new source_code.scan(/url\("?images\/([-_.a-zA-Z0-9]+)"?\)/).map(&:first)
+  code = image_dependencies.inject("") do |acc, img|
+    acc += " *= depend_on_asset \"jquery-ui/#{img}\"\n"
+  end
+end
+
+desc "Remove the app directory"
 task :clean do
-  rm_rf 'vendor'
+  rm_rf 'app'
 end
 
 desc "Generate the JavaScript assets"
 task :javascripts => :submodule do
-  target_dir = "vendor/assets/javascripts"
-  mkdir_p target_dir
   Rake.rake_output_message 'Generating javascripts'
+
+  target_dir = "app/assets/javascripts"
+  mkdir_p target_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))
@@ -140,10 +150,11 @@ end
 
 desc "Generate the CSS assets"
 task :stylesheets => :submodule do
-  target_dir = "vendor/assets/stylesheets"
-  mkdir_p target_dir
   Rake.rake_output_message 'Generating stylesheets'
 
+  target_dir = "app/assets/stylesheets"
+  mkdir_p target_dir
+
   css_dir = "jquery-ui/themes/base"
   Dir.glob("#{css_dir}/*.css").each do |path|
     basename = File.basename(path)
@@ -178,8 +189,9 @@ task :stylesheets => :submodule do
     }
     # 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") %>)')
+    source_code.gsub!(/url\("?images\/([-_.a-zA-Z0-9]+)"?\)/, 'url(<%= image_path("jquery-ui/\1") %>)')
     File.open("#{target_dir}/#{basename}.erb", "w") do |out|
       out.write(source_code)
     end
@@ -188,14 +200,30 @@ end
 
 desc "Generate the image assets"
 task :images => :submodule do
-  target_dir = "vendor/assets/images/jquery-ui"
-  mkdir_p target_dir
   Rake.rake_output_message 'Copying images'
-  FileUtils.cp(Dir.glob("jquery-ui/themes/base/images/*.png"), target_dir)
+
+  target_dir = "app/assets/images/jquery-ui"
+  mkdir_p target_dir
+
+  FileUtils.cp(Dir.glob("jquery-ui/themes/base/images/*"), target_dir)
+end
+
+desc "Update Jquery::Ui::Rails::JQUERY_UI_VERSION"
+task :version => :submodule do
+  Rake.rake_output_message "Setting Jquery::Ui::Rails::JQUERY_UI_VERSION = \"#{version}\""
+
+  versionRb = 'lib/jquery/ui/rails/version.rb'
+  versionRbSource = File.read(versionRb)
+  versionDefinition = "JQUERY_UI_VERSION = \"#{version}\""
+  versionRbSource.sub! /JQUERY_UI_VERSION = "[^"]*"/, versionDefinition \
+    or fail "Could not find JQUERY_UI_VERSION in #{versionRb}"
+  File.open(versionRb, 'w') do |out|
+    out.write(versionRbSource)
+  end
 end
 
 desc "Clean and then generate everything (default)"
-task :assets => [:clean, :javascripts, :stylesheets, :images]
+task :assets => [:clean, :javascripts, :stylesheets, :images, :version]
 
 task :build => :assets
 

data/VERSIONS.md

@@ -0,0 +1,31 @@
+# Bundled Versions
+
+| Gem    | jQuery UI |
+|--------|-----------|
+| 4.2.1  | 1.10.4    |
+| 4.2.0  | 1.10.3    |
+| 4.1.2  | 1.10.3    |
+| 4.1.1  | 1.10.3    |
+| 4.1.0  | 1.10.3    |
+| 4.0.5  | 1.10.3    |
+| 4.0.4  | 1.10.3    |
+| 4.0.3  | 1.10.3    |
+| 4.0.2  | 1.10.0    |
+| 4.0.1  | 1.10.0    |
+| 4.0.0  | 1.10.0    |
+| 3.0.1  | 1.9.2     |
+| 3.0.0  | 1.9.2     |
+| 2.0.2  | 1.8.24    |
+| 2.0.1  | 1.8.23    |
+| 2.0.0  | 1.8.23    |
+| 1.1.1  | 1.8.23    |
+| 1.1.0  | 1.8.22    |
+| 1.0.0  | 1.8.21    |
+| 0.5.0  | 1.8.21    |
+| 0.4.1  | 1.8.20    |
+| 0.4.0  | 1.8.20    |
+| 0.3.0  | 1.8.19    |
+| 0.2.2  | 1.8.18    |
+| 0.2.1  | 1.8.18    |
+| 0.2.0  | 1.8.17    |
+| 0.1.0  | 1.8.16    |

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

@@ -2,10 +2,10 @@
 //= require jquery.ui.widget
 
 /*!
- * jQuery UI Accordion 1.10.0
+ * jQuery UI Accordion 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -27,7 +27,7 @@ showProps.height = showProps.paddingTop = showProps.paddingBottom =
 	showProps.borderTopWidth = showProps.borderBottomWidth = "show";
 
 $.widget( "ui.accordion", {
-	version: "1.10.0",
+	version: "1.10.4",
 	options: {
 		active: 0,
 		animate: {},
@@ -68,6 +68,7 @@ $.widget( "ui.accordion", {
 	_getCreateEventData: function() {
 		return {
 			header: this.active,
+			panel: !this.active.length ? $() : this.active.next(),
 			content: !this.active.length ? $() : this.active.next()
 		};
 	},
@@ -104,6 +105,7 @@ $.widget( "ui.accordion", {
 		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" )
 			.removeAttr( "role" )
+			.removeAttr( "aria-expanded" )
 			.removeAttr( "aria-selected" )
 			.removeAttr( "aria-controls" )
 			.removeAttr( "tabIndex" )
@@ -118,7 +120,6 @@ $.widget( "ui.accordion", {
 		contents = this.headers.next()
 			.css( "display", "" )
 			.removeAttr( "role" )
-			.removeAttr( "aria-expanded" )
 			.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" )
@@ -169,7 +170,6 @@ $.widget( "ui.accordion", {
 	},
 
 	_keydown: function( event ) {
-		/*jshint maxcomplexity:15*/
 		if ( event.altKey || event.ctrlKey ) {
 			return;
 		}
@@ -223,7 +223,7 @@ $.widget( "ui.accordion", {
 			options.active = false;
 			this.active = $();
 		// active false only when collapsible is true
-		} if ( options.active === false ) {
+		} else if ( options.active === false ) {
 			this._activate( 0 );
 		// was active, but active panel is gone
 		} else if ( this.active.length && !$.contains( this.element[ 0 ], this.active[ 0 ] ) ) {
@@ -265,8 +265,8 @@ $.widget( "ui.accordion", {
 				(this.element.attr( "id" ) || ++uid);
 
 		this.active = this._findActive( options.active )
-			.addClass( "ui-accordion-header-active ui-state-active" )
-			.toggleClass( "ui-corner-all ui-corner-top" );
+			.addClass( "ui-accordion-header-active ui-state-active ui-corner-top" )
+			.removeClass( "ui-corner-all" );
 		this.active.next()
 			.addClass( "ui-accordion-content-active" )
 			.show();
@@ -296,11 +296,11 @@ $.widget( "ui.accordion", {
 			.not( this.active )
 			.attr({
 				"aria-selected": "false",
+				"aria-expanded": "false",
 				tabIndex: -1
 			})
 			.next()
 				.attr({
-					"aria-expanded": "false",
 					"aria-hidden": "true"
 				})
 				.hide();
@@ -311,11 +311,11 @@ $.widget( "ui.accordion", {
 		} else {
 			this.active.attr({
 				"aria-selected": "true",
+				"aria-expanded": "true",
 				tabIndex: 0
 			})
 			.next()
 				.attr({
-					"aria-expanded": "true",
 					"aria-hidden": "false"
 				});
 		}
@@ -470,7 +470,6 @@ $.widget( "ui.accordion", {
 		}
 
 		toHide.attr({
-			"aria-expanded": "false",
 			"aria-hidden": "true"
 		});
 		toHide.prev().attr( "aria-selected", "false" );
@@ -478,7 +477,10 @@ $.widget( "ui.accordion", {
 		// if we're opening from collapsed state, remove the previous header from the tab order
 		// if we're collapsing, then keep the collapsing header in the tab order
 		if ( toShow.length && toHide.length ) {
-			toHide.prev().attr( "tabIndex", -1 );
+			toHide.prev().attr({
+				"tabIndex": -1,
+				"aria-expanded": "false"
+			});
 		} else if ( toShow.length ) {
 			this.headers.filter(function() {
 				return $( this ).attr( "tabIndex" ) === 0;
@@ -487,14 +489,12 @@ $.widget( "ui.accordion", {
 		}
 
 		toShow
-			.attr({
-				"aria-expanded": "true",
-				"aria-hidden": "false"
-			})
+			.attr( "aria-hidden", "false" )
 			.prev()
 				.attr({
 					"aria-selected": "true",
-					tabIndex: 0
+					tabIndex: 0,
+					"aria-expanded": "true"
 				});
 	},
 
@@ -566,7 +566,6 @@ $.widget( "ui.accordion", {
 		if ( toHide.length ) {
 			toHide.parent()[0].className = toHide.parent()[0].className;
 		}
-
 		this._trigger( "activate", null, data );
 	}
 });

data/{vendor → app}/assets/javascripts/jquery.ui.autocomplete.js

@@ -4,10 +4,10 @@
 //= require jquery.ui.position
 
 /*!
- * jQuery UI Autocomplete 1.10.0
+ * jQuery UI Autocomplete 1.10.4
  * http://jqueryui.com
  *
- * Copyright 2013 jQuery Foundation and other contributors
+ * Copyright 2014 jQuery Foundation and other contributors
  * Released under the MIT license.
  * http://jquery.org/license
  *
@@ -21,11 +21,8 @@
  */
 (function( $, undefined ) {
 
-// used to prevent race conditions with remote data sources
-var requestIndex = 0;
-
 $.widget( "ui.autocomplete", {
-	version: "1.10.0",
+	version: "1.10.4",
 	defaultElement: "<input>",
 	options: {
 		appendTo: null,
@@ -49,6 +46,7 @@ $.widget( "ui.autocomplete", {
 		select: null
 	},
 
+	requestIndex: 0,
 	pending: 0,
 
 	_create: function() {
@@ -59,10 +57,21 @@ $.widget( "ui.autocomplete", {
 		// so we use the suppressKeyPressRepeat flag to avoid handling keypress
 		// events when we know the keydown event was used to modify the
 		// search term. #7799
-		var suppressKeyPress, suppressKeyPressRepeat, suppressInput;
-
-		this.isMultiLine = this._isMultiLine();
-		this.valueMethod = this.element[ this.element.is( "input,textarea" ) ? "val" : "text" ];
+		var suppressKeyPress, suppressKeyPressRepeat, suppressInput,
+			nodeName = this.element[0].nodeName.toLowerCase(),
+			isTextarea = nodeName === "textarea",
+			isInput = nodeName === "input";
+
+		this.isMultiLine =
+			// Textareas are always multi-line
+			isTextarea ? true :
+			// Inputs are always single-line, even if inside a contentEditable element
+			// IE also treats inputs as contentEditable
+			isInput ? false :
+			// All other element types are determined by whether or not they're contentEditable
+			this.element.prop( "isContentEditable" );
+
+		this.valueMethod = this.element[ isTextarea || isInput ? "val" : "text" ];
 		this.isNewMenu = true;
 
 		this.element
@@ -71,7 +80,6 @@ $.widget( "ui.autocomplete", {
 
 		this._on( this.element, {
 			keydown: function( event ) {
-				/*jshint maxcomplexity:15*/
 				if ( this.element.prop( "readOnly" ) ) {
 					suppressKeyPress = true;
 					suppressInput = true;
@@ -136,7 +144,9 @@ $.widget( "ui.autocomplete", {
 			keypress: function( event ) {
 				if ( suppressKeyPress ) {
 					suppressKeyPress = false;
-					event.preventDefault();
+					if ( !this.isMultiLine || this.menu.element.is( ":visible" ) ) {
+						event.preventDefault();
+					}
 					return;
 				}
 				if ( suppressKeyPressRepeat ) {
@@ -186,15 +196,12 @@ $.widget( "ui.autocomplete", {
 
 		this._initSource();
 		this.menu = $( "<ul>" )
-			.addClass( "ui-autocomplete" )
+			.addClass( "ui-autocomplete ui-front" )
 			.appendTo( this._appendTo() )
 			.menu({
-				// custom key handling for now
-				input: $(),
 				// disable ARIA support, the live region takes care of that
 				role: null
 			})
-			.zIndex( this.element.zIndex() + 1 )
 			.hide()
 			.data( "ui-menu" );
 
@@ -229,7 +236,8 @@ $.widget( "ui.autocomplete", {
 				}
 			},
 			menufocus: function( event, ui ) {
-				// #7024 - Prevent accidental activation of menu items in Firefox
+				// support: Firefox
+				// Prevent accidental activation of menu items in Firefox (#7024 #9118)
 				if ( this.isNewMenu ) {
 					this.isNewMenu = false;
 					if ( event.originalEvent && /^mouse/.test( event.originalEvent.type ) ) {
@@ -292,7 +300,7 @@ $.widget( "ui.autocomplete", {
 				"aria-live": "polite"
 			})
 			.addClass( "ui-helper-hidden-accessible" )
-			.insertAfter( this.element );
+			.insertBefore( this.element );
 
 		// turning off autocomplete prevents the browser from remembering the
 		// value when navigating through history, so we re-enable autocomplete
@@ -346,20 +354,6 @@ $.widget( "ui.autocomplete", {
 		return element;
 	},
 
-	_isMultiLine: function() {
-		// Textareas are always multi-line
-		if ( this.element.is( "textarea" ) ) {
-			return true;
-		}
-		// Inputs are always single-line, even if inside a contentEditable element
-		// IE also treats inputs as contentEditable
-		if ( this.element.is( "input" ) ) {
-			return false;
-		}
-		// All other element types are determined by whether or not they're contentEditable
-		return this.element.prop( "isContentEditable" );
-	},
-
 	_initSource: function() {
 		var array, url,
 			that = this;
@@ -428,19 +422,18 @@ $.widget( "ui.autocomplete", {
 	},
 
 	_response: function() {
-		var that = this,
-			index = ++requestIndex;
+		var index = ++this.requestIndex;
 
-		return function( content ) {
-			if ( index === requestIndex ) {
-				that.__response( content );
+		return $.proxy(function( content ) {
+			if ( index === this.requestIndex ) {
+				this.__response( content );
 			}
 
-			that.pending--;
-			if ( !that.pending ) {
-				that.element.removeClass( "ui-autocomplete-loading" );
+			this.pending--;
+			if ( !this.pending ) {
+				this.element.removeClass( "ui-autocomplete-loading" );
 			}
-		};
+		}, this );
 	},
 
 	__response: function( content ) {
@@ -497,10 +490,9 @@ $.widget( "ui.autocomplete", {
 	},
 
 	_suggest: function( items ) {
-		var ul = this.menu.element
-			.empty()
-			.zIndex( this.element.zIndex() + 1 );
+		var ul = this.menu.element.empty();
 		this._renderMenu( ul, items );
+		this.isNewMenu = true;
 		this.menu.refresh();
 
 		// size and position menu