Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrades jquery-ui to 1.13.0 #139

Merged
merged 2 commits into from
Feb 21, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 4 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -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`
Expand Down
7 changes: 6 additions & 1 deletion Rakefile
Original file line number Diff line number Diff line change
Expand Up @@ -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?

Expand Down Expand Up @@ -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)
Expand Down Expand Up @@ -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

Expand Down
1 change: 1 addition & 0 deletions VERSIONS.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down
Binary file modified app/assets/images/jquery-ui/ui-icons_444444_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/jquery-ui/ui-icons_555555_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/jquery-ui/ui-icons_777620_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/jquery-ui/ui-icons_777777_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/jquery-ui/ui-icons_cc0000_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/assets/images/jquery-ui/ui-icons_ffffff_256x240.png
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
5 changes: 3 additions & 2 deletions app/assets/javascripts/jquery-ui.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
2 changes: 1 addition & 1 deletion app/assets/javascripts/jquery-ui/core.js
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
12 changes: 8 additions & 4 deletions app/assets/javascripts/jquery-ui/data.js
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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.
Expand All @@ -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 ) {
Expand All @@ -38,4 +42,4 @@ return $.extend( $.expr[ ":" ], {
return !!$.data( elem, match[ 3 ] );
}
} );
} ) );
} );
9 changes: 6 additions & 3 deletions app/assets/javascripts/jquery-ui/disable-selection.js
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -16,6 +16,8 @@

// This file is deprecated
( function( factory ) {
"use strict";

if ( typeof define === "function" && define.amd ) {

// AMD. Register as an anonymous module.
Expand All @@ -25,7 +27,8 @@
// Browser globals
factory( jQuery );
}
} ( function( $ ) {
} )( function( $ ) {
"use strict";

return $.fn.extend( {
disableSelection: ( function() {
Expand All @@ -45,4 +48,4 @@ return $.fn.extend( {
}
} );

} ) );
} );