Merge pull request #139 from nescalera/jquery-ui-1.13.0

Upgrades jquery-ui to 1.13.0, release 7.0.0

History.md

@@ -1,5 +1,9 @@
 # master
 
+# 7.0.0
+
+* Update to jQuery UI 1.13.0
+
 # 6.0.1
 
 * Fix "define is not defined" issue in `core.js`

Rakefile

@@ -31,7 +31,7 @@ def map_dependencies
     basename = File.basename path
     file = File.read path
 
-    matchdata = file.match(/define\(\s*\[\s*([\"\.\/\,\w\s-\:]+)\]/m)
+    matchdata = file.match(/define\(\s*\[\s*([\"\.\/\,\w\s\-\:]+)\]/m)
 
     next if matchdata.nil?
 
@@ -118,6 +118,7 @@ task :javascripts => :submodule do
   mkdir_p target_ui_dir + '/effects'
   mkdir_p target_ui_dir + '/widgets'
   mkdir_p target_ui_dir + '/i18n'
+  mkdir_p target_ui_dir + '/vendor/jquery-color'
 
   Dir.glob("jquery-ui/ui/**/*.js").each do |path|
     basename = File.basename(path)
@@ -170,6 +171,10 @@ task :javascripts => :submodule do
       clean_path = remove_js_extension(path).gsub('/ui', '')
       out.write("//= require #{clean_path}\n")
     end
+    Dir.glob("jquery-ui/ui/vendor/jquery-color/*.js").sort.each do |path|
+      clean_path = remove_js_extension(path).gsub('/ui', '')
+      out.write("//= require #{clean_path}\n")
+    end
   end
 end
 

VERSIONS.md

@@ -2,6 +2,7 @@
 
 | Gem    | jQuery UI |
 |--------|-----------|
+| 7.0.0  | 1.13.0    |
 | 6.0.1  | 1.12.1    |
 | 6.0.0  | 1.12.1    |
 | 5.0.5  | 1.11.4    |

app/assets/javascripts/jquery-ui.js

@@ -2,12 +2,12 @@
 //= require jquery-ui/data
 //= require jquery-ui/disable-selection
 //= require jquery-ui/effect
-//= require jquery-ui/escape-selector
 //= require jquery-ui/focusable
 //= require jquery-ui/form-reset-mixin
 //= require jquery-ui/form
 //= require jquery-ui/ie
-//= require jquery-ui/jquery-1-7
+//= require jquery-ui/jquery-patch
+//= require jquery-ui/jquery-var-for-color
 //= require jquery-ui/keycode
 //= require jquery-ui/labels
 //= require jquery-ui/plugin
@@ -54,3 +54,4 @@
 //= require jquery-ui/widgets/spinner
 //= require jquery-ui/widgets/tabs
 //= require jquery-ui/widgets/tooltip
+//= require jquery-ui/vendor/jquery-color/jquery.color

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

@@ -5,7 +5,7 @@
 //= require jquery-ui/ie
 //= require jquery-ui/keycode
 //= require jquery-ui/labels
-//= require jquery-ui/jquery-1-7
+//= require jquery-ui/jquery-patch
 //= require jquery-ui/plugin
 //= require jquery-ui/safe-active-element
 //= require jquery-ui/safe-blur

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

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI :data 1.12.1
+ * jQuery UI :data 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -15,6 +15,8 @@
 //>>docs: http://api.jqueryui.com/data-selector/
 
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -24,8 +26,10 @@
 		// Browser globals
 		factory( jQuery );
 	}
-} ( function( $ ) {
-return $.extend( $.expr[ ":" ], {
+} )( function( $ ) {
+"use strict";
+
+return $.extend( $.expr.pseudos, {
 	data: $.expr.createPseudo ?
 		$.expr.createPseudo( function( dataName ) {
 			return function( elem ) {
@@ -38,4 +42,4 @@ return $.extend( $.expr[ ":" ], {
 			return !!$.data( elem, match[ 3 ] );
 		}
 } );
-} ) );
+} );

app/assets/javascripts/jquery-ui/disable-selection.js

@@ -1,7 +1,7 @@
 //= require jquery-ui/version
 
 /*!
- * jQuery UI Disable Selection 1.12.1
+ * jQuery UI Disable Selection 1.13.0
  * http://jqueryui.com
  *
  * Copyright jQuery Foundation and other contributors
@@ -16,6 +16,8 @@
 
 // This file is deprecated
 ( function( factory ) {
+	"use strict";
+
 	if ( typeof define === "function" && define.amd ) {
 
 		// AMD. Register as an anonymous module.
@@ -25,7 +27,8 @@
 		// Browser globals
 		factory( jQuery );
 	}
-} ( function( $ ) {
+} )( function( $ ) {
+"use strict";
 
 return $.fn.extend( {
 	disableSelection: ( function() {
@@ -45,4 +48,4 @@ return $.fn.extend( {
 	}
 } );
 
-} ) );
+} );