Skip to content

Commit 413265e

Browse files
BorzikBorzik
authored
Merge pull request #139 from nescalera/jquery-ui-1.13.0
Upgrades jquery-ui to 1.13.0, release 7.0.0
2 parents 0b22d46 + 27a942c commit 413265e

File tree

168 files changed

+2860
-2017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

168 files changed

+2860
-2017
lines changed

‎History.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
# master
22

3+
# 7.0.0
4+
5+
* Update to jQuery UI 1.13.0
6+
37
# 6.0.1
48

59
* Fix "define is not defined" issue in `core.js`

‎Rakefile

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ def map_dependencies
3131
basename = File.basename path
3232
file = File.read path
3333

34-
matchdata = file.match(/define\(\s*\[\s*([\"\.\/\,\w\s-\:]+)\]/m)
34+
matchdata = file.match(/define\(\s*\[\s*([\"\.\/\,\w\s\-\:]+)\]/m)
3535

3636
next if matchdata.nil?
3737

@@ -118,6 +118,7 @@ task :javascripts => :submodule do
118118
mkdir_p target_ui_dir + '/effects'
119119
mkdir_p target_ui_dir + '/widgets'
120120
mkdir_p target_ui_dir + '/i18n'
121+
mkdir_p target_ui_dir + '/vendor/jquery-color'
121122

122123
Dir.glob("jquery-ui/ui/**/*.js").each do |path|
123124
basename = File.basename(path)
@@ -170,6 +171,10 @@ task :javascripts => :submodule do
170171
clean_path = remove_js_extension(path).gsub('/ui', '')
171172
out.write("//= require #{clean_path}\n")
172173
end
174+
Dir.glob("jquery-ui/ui/vendor/jquery-color/*.js").sort.each do |path|
175+
clean_path = remove_js_extension(path).gsub('/ui', '')
176+
out.write("//= require #{clean_path}\n")
177+
end
173178
end
174179
end
175180

‎VERSIONS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
| Gem | jQuery UI |
44
|--------|-----------|
5+
| 7.0.0 | 1.13.0 |
56
| 6.0.1 | 1.12.1 |
67
| 6.0.0 | 1.12.1 |
78
| 5.0.5 | 1.11.4 |

‎app/assets/images/jquery-ui/ui-icons_444444_256x240.png

-490 Bytes
Loading

‎app/assets/images/jquery-ui/ui-icons_555555_256x240.png

-482 Bytes
Loading

‎app/assets/images/jquery-ui/ui-icons_777620_256x240.png

-494 Bytes
Loading

‎app/assets/images/jquery-ui/ui-icons_777777_256x240.png

-490 Bytes
Loading

‎app/assets/images/jquery-ui/ui-icons_cc0000_256x240.png

-494 Bytes
Loading

‎app/assets/images/jquery-ui/ui-icons_ffffff_256x240.png

-492 Bytes
Loading

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

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@
22
//= require jquery-ui/data
33
//= require jquery-ui/disable-selection
44
//= require jquery-ui/effect
5-
//= require jquery-ui/escape-selector
65
//= require jquery-ui/focusable
76
//= require jquery-ui/form-reset-mixin
87
//= require jquery-ui/form
98
//= require jquery-ui/ie
10-
//= require jquery-ui/jquery-1-7
9+
//= require jquery-ui/jquery-patch
10+
//= require jquery-ui/jquery-var-for-color
1111
//= require jquery-ui/keycode
1212
//= require jquery-ui/labels
1313
//= require jquery-ui/plugin
@@ -54,3 +54,4 @@
5454
//= require jquery-ui/widgets/spinner
5555
//= require jquery-ui/widgets/tabs
5656
//= require jquery-ui/widgets/tooltip
57+
//= require jquery-ui/vendor/jquery-color/jquery.color

0 commit comments

Comments
 (0)