Skip to content

Commit 441a9eb

Browse files
BorzikBorzik
committed
get rid of .js extensions in //= require blocks
1 parent d45cf46 commit 441a9eb

File tree

4 files changed

+78
-78
lines changed

4 files changed

+78
-78
lines changed

‎Rakefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ require 'bundler/gem_tasks'
1717
# The only exception is "jquery", which doesn't follow the
1818
# same naming conventions so it's a special case.
1919
def source_file_for_dependency_entry(caller, dep_entry)
20-
return "jquery.js" if dep_entry == 'jquery'
21-
2220
p = Pathname.new caller
2321
parent_path = p.parent
2422
parent_path.join(dep_entry + '.js').to_s
@@ -47,6 +45,8 @@ def map_dependencies
4745

4846
deps_paths = deps.split(',')
4947

48+
deps_paths.map!(&method(:remove_js_extension))
49+
5050
# None of jquery.ui files should depend on jquery.js,
5151
# so we remove 'jquery' from the list of dependencies for all files
5252
deps_paths.reject! {|d| d == "jquery" }
@@ -150,21 +150,21 @@ task :javascripts => :submodule do
150150

151151
File.open("#{target_ui_dir}/effect.all.js", "w") do |out|
152152
Dir.glob("jquery-ui/ui/effects/*.js").sort.each do |path|
153-
clean_path = path.gsub('/ui', '')
153+
clean_path = remove_js_extension(path).gsub('/ui', '')
154154
out.write("//= require #{clean_path}\n")
155155
end
156156
end
157157
File.open("#{target_dir}/jquery-ui.js", "w") do |out|
158158
Dir.glob("jquery-ui/ui/*.js").sort.each do |path|
159-
clean_path = path.gsub('/ui', '')
159+
clean_path = remove_js_extension(path).gsub('/ui', '')
160160
out.write("//= require #{clean_path}\n")
161161
end
162162
Dir.glob("jquery-ui/ui/effects/*.js").sort.each do |path|
163-
clean_path = path.gsub('/ui', '')
163+
clean_path = remove_js_extension(path).gsub('/ui', '')
164164
out.write("//= require #{clean_path}\n")
165165
end
166166
Dir.glob("jquery-ui/ui/widgets/*.js").sort.each do |path|
167-
clean_path = path.gsub('/ui', '')
167+
clean_path = remove_js_extension(path).gsub('/ui', '')
168168
out.write("//= require #{clean_path}\n")
169169
end
170170
end

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

Lines changed: 56 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -1,56 +1,56 @@
1-
//= require jquery-ui/core.js
2-
//= require jquery-ui/data.js
3-
//= require jquery-ui/disable-selection.js
4-
//= require jquery-ui/effect.js
5-
//= require jquery-ui/escape-selector.js
6-
//= require jquery-ui/focusable.js
7-
//= require jquery-ui/form-reset-mixin.js
8-
//= require jquery-ui/form.js
9-
//= require jquery-ui/ie.js
10-
//= require jquery-ui/jquery-1-7.js
11-
//= require jquery-ui/keycode.js
12-
//= require jquery-ui/labels.js
13-
//= require jquery-ui/plugin.js
14-
//= require jquery-ui/position.js
15-
//= require jquery-ui/safe-active-element.js
16-
//= require jquery-ui/safe-blur.js
17-
//= require jquery-ui/scroll-parent.js
18-
//= require jquery-ui/tabbable.js
19-
//= require jquery-ui/unique-id.js
20-
//= require jquery-ui/version.js
21-
//= require jquery-ui/widget.js
22-
//= require jquery-ui/effects/effect-blind.js
23-
//= require jquery-ui/effects/effect-bounce.js
24-
//= require jquery-ui/effects/effect-clip.js
25-
//= require jquery-ui/effects/effect-drop.js
26-
//= require jquery-ui/effects/effect-explode.js
27-
//= require jquery-ui/effects/effect-fade.js
28-
//= require jquery-ui/effects/effect-fold.js
29-
//= require jquery-ui/effects/effect-highlight.js
30-
//= require jquery-ui/effects/effect-puff.js
31-
//= require jquery-ui/effects/effect-pulsate.js
32-
//= require jquery-ui/effects/effect-scale.js
33-
//= require jquery-ui/effects/effect-shake.js
34-
//= require jquery-ui/effects/effect-size.js
35-
//= require jquery-ui/effects/effect-slide.js
36-
//= require jquery-ui/effects/effect-transfer.js
37-
//= require jquery-ui/widgets/accordion.js
38-
//= require jquery-ui/widgets/autocomplete.js
39-
//= require jquery-ui/widgets/button.js
40-
//= require jquery-ui/widgets/checkboxradio.js
41-
//= require jquery-ui/widgets/controlgroup.js
42-
//= require jquery-ui/widgets/datepicker.js
43-
//= require jquery-ui/widgets/dialog.js
44-
//= require jquery-ui/widgets/draggable.js
45-
//= require jquery-ui/widgets/droppable.js
46-
//= require jquery-ui/widgets/menu.js
47-
//= require jquery-ui/widgets/mouse.js
48-
//= require jquery-ui/widgets/progressbar.js
49-
//= require jquery-ui/widgets/resizable.js
50-
//= require jquery-ui/widgets/selectable.js
51-
//= require jquery-ui/widgets/selectmenu.js
52-
//= require jquery-ui/widgets/slider.js
53-
//= require jquery-ui/widgets/sortable.js
54-
//= require jquery-ui/widgets/spinner.js
55-
//= require jquery-ui/widgets/tabs.js
56-
//= require jquery-ui/widgets/tooltip.js
1+
//= require jquery-ui/core
2+
//= require jquery-ui/data
3+
//= require jquery-ui/disable-selection
4+
//= require jquery-ui/effect
5+
//= require jquery-ui/escape-selector
6+
//= require jquery-ui/focusable
7+
//= require jquery-ui/form-reset-mixin
8+
//= require jquery-ui/form
9+
//= require jquery-ui/ie
10+
//= require jquery-ui/jquery-1-7
11+
//= require jquery-ui/keycode
12+
//= require jquery-ui/labels
13+
//= require jquery-ui/plugin
14+
//= require jquery-ui/position
15+
//= require jquery-ui/safe-active-element
16+
//= require jquery-ui/safe-blur
17+
//= require jquery-ui/scroll-parent
18+
//= require jquery-ui/tabbable
19+
//= require jquery-ui/unique-id
20+
//= require jquery-ui/version
21+
//= require jquery-ui/widget
22+
//= require jquery-ui/effects/effect-blind
23+
//= require jquery-ui/effects/effect-bounce
24+
//= require jquery-ui/effects/effect-clip
25+
//= require jquery-ui/effects/effect-drop
26+
//= require jquery-ui/effects/effect-explode
27+
//= require jquery-ui/effects/effect-fade
28+
//= require jquery-ui/effects/effect-fold
29+
//= require jquery-ui/effects/effect-highlight
30+
//= require jquery-ui/effects/effect-puff
31+
//= require jquery-ui/effects/effect-pulsate
32+
//= require jquery-ui/effects/effect-scale
33+
//= require jquery-ui/effects/effect-shake
34+
//= require jquery-ui/effects/effect-size
35+
//= require jquery-ui/effects/effect-slide
36+
//= require jquery-ui/effects/effect-transfer
37+
//= require jquery-ui/widgets/accordion
38+
//= require jquery-ui/widgets/autocomplete
39+
//= require jquery-ui/widgets/button
40+
//= require jquery-ui/widgets/checkboxradio
41+
//= require jquery-ui/widgets/controlgroup
42+
//= require jquery-ui/widgets/datepicker
43+
//= require jquery-ui/widgets/dialog
44+
//= require jquery-ui/widgets/draggable
45+
//= require jquery-ui/widgets/droppable
46+
//= require jquery-ui/widgets/menu
47+
//= require jquery-ui/widgets/mouse
48+
//= require jquery-ui/widgets/progressbar
49+
//= require jquery-ui/widgets/resizable
50+
//= require jquery-ui/widgets/selectable
51+
//= require jquery-ui/widgets/selectmenu
52+
//= require jquery-ui/widgets/slider
53+
//= require jquery-ui/widgets/sortable
54+
//= require jquery-ui/widgets/spinner
55+
//= require jquery-ui/widgets/tabs
56+
//= require jquery-ui/widgets/tooltip

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

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
//= require jquery-ui/effects/effect-blind.js
2-
//= require jquery-ui/effects/effect-bounce.js
3-
//= require jquery-ui/effects/effect-clip.js
4-
//= require jquery-ui/effects/effect-drop.js
5-
//= require jquery-ui/effects/effect-explode.js
6-
//= require jquery-ui/effects/effect-fade.js
7-
//= require jquery-ui/effects/effect-fold.js
8-
//= require jquery-ui/effects/effect-highlight.js
9-
//= require jquery-ui/effects/effect-puff.js
10-
//= require jquery-ui/effects/effect-pulsate.js
11-
//= require jquery-ui/effects/effect-scale.js
12-
//= require jquery-ui/effects/effect-shake.js
13-
//= require jquery-ui/effects/effect-size.js
14-
//= require jquery-ui/effects/effect-slide.js
15-
//= require jquery-ui/effects/effect-transfer.js
1+
//= require jquery-ui/effects/effect-blind
2+
//= require jquery-ui/effects/effect-bounce
3+
//= require jquery-ui/effects/effect-clip
4+
//= require jquery-ui/effects/effect-drop
5+
//= require jquery-ui/effects/effect-explode
6+
//= require jquery-ui/effects/effect-fade
7+
//= require jquery-ui/effects/effect-fold
8+
//= require jquery-ui/effects/effect-highlight
9+
//= require jquery-ui/effects/effect-puff
10+
//= require jquery-ui/effects/effect-pulsate
11+
//= require jquery-ui/effects/effect-scale
12+
//= require jquery-ui/effects/effect-shake
13+
//= require jquery-ui/effects/effect-size
14+
//= require jquery-ui/effects/effect-slide
15+
//= require jquery-ui/effects/effect-transfer

‎jquery-ui-rails.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
1515

1616
s.add_dependency "railties", ">= 3.2.16"
1717

18-
s.add_development_dependency "json", "~> 1.7"
18+
s.add_development_dependency "json", "~> 2.0.2"
1919

2020
s.files = `git ls-files`.split("\n").reject { |f| f =~ /^testapp|^jquery-ui/ }
2121
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }

0 commit comments

Comments
 (0)