Skip to content

Commit

Permalink
get rid of .js extensions in //= require blocks
Browse files Browse the repository at this point in the history
  • Loading branch information
@Borzik
Borzik committed Nov 29, 2016
1 parent d45cf46 commit 441a9eb
Show file tree
Hide file tree
Showing 4 changed files with 78 additions and 78 deletions.
12 changes: 6 additions & 6 deletions Rakefile
View file
Expand Up @@ -17,8 +17,6 @@ require 'bundler/gem_tasks'
# The only exception is "jquery", which doesn't follow the
# same naming conventions so it's a special case.
def source_file_for_dependency_entry(caller, dep_entry)
return "jquery.js" if dep_entry == 'jquery'

p = Pathname.new caller
parent_path = p.parent
parent_path.join(dep_entry + '.js').to_s
Expand Down Expand Up @@ -47,6 +45,8 @@ def map_dependencies

deps_paths = deps.split(',')

deps_paths.map!(&method(:remove_js_extension))

# None of jquery.ui files should depend on jquery.js,
# so we remove 'jquery' from the list of dependencies for all files
deps_paths.reject! {|d| d == "jquery" }
Expand Down Expand Up @@ -150,21 +150,21 @@ task :javascripts => :submodule do

File.open("#{target_ui_dir}/effect.all.js", "w") do |out|
Dir.glob("jquery-ui/ui/effects/*.js").sort.each do |path|
clean_path = path.gsub('/ui', '')
clean_path = remove_js_extension(path).gsub('/ui', '')
out.write("//= require #{clean_path}\n")
end
end
File.open("#{target_dir}/jquery-ui.js", "w") do |out|
Dir.glob("jquery-ui/ui/*.js").sort.each do |path|
clean_path = path.gsub('/ui', '')
clean_path = remove_js_extension(path).gsub('/ui', '')
out.write("//= require #{clean_path}\n")
end
Dir.glob("jquery-ui/ui/effects/*.js").sort.each do |path|
clean_path = path.gsub('/ui', '')
clean_path = remove_js_extension(path).gsub('/ui', '')
out.write("//= require #{clean_path}\n")
end
Dir.glob("jquery-ui/ui/widgets/*.js").sort.each do |path|
clean_path = path.gsub('/ui', '')
clean_path = remove_js_extension(path).gsub('/ui', '')
out.write("//= require #{clean_path}\n")
end
end
Expand Down
112 changes: 56 additions & 56 deletions app/assets/javascripts/jquery-ui.js
View file
@@ -1,56 +1,56 @@
//= require jquery-ui/core.js
//= require jquery-ui/data.js
//= require jquery-ui/disable-selection.js
//= require jquery-ui/effect.js
//= require jquery-ui/escape-selector.js
//= require jquery-ui/focusable.js
//= require jquery-ui/form-reset-mixin.js
//= require jquery-ui/form.js
//= require jquery-ui/ie.js
//= require jquery-ui/jquery-1-7.js
//= require jquery-ui/keycode.js
//= require jquery-ui/labels.js
//= require jquery-ui/plugin.js
//= require jquery-ui/position.js
//= require jquery-ui/safe-active-element.js
//= require jquery-ui/safe-blur.js
//= require jquery-ui/scroll-parent.js
//= require jquery-ui/tabbable.js
//= require jquery-ui/unique-id.js
//= require jquery-ui/version.js
//= require jquery-ui/widget.js
//= require jquery-ui/effects/effect-blind.js
//= require jquery-ui/effects/effect-bounce.js
//= require jquery-ui/effects/effect-clip.js
//= require jquery-ui/effects/effect-drop.js
//= require jquery-ui/effects/effect-explode.js
//= require jquery-ui/effects/effect-fade.js
//= require jquery-ui/effects/effect-fold.js
//= require jquery-ui/effects/effect-highlight.js
//= require jquery-ui/effects/effect-puff.js
//= require jquery-ui/effects/effect-pulsate.js
//= require jquery-ui/effects/effect-scale.js
//= require jquery-ui/effects/effect-shake.js
//= require jquery-ui/effects/effect-size.js
//= require jquery-ui/effects/effect-slide.js
//= require jquery-ui/effects/effect-transfer.js
//= require jquery-ui/widgets/accordion.js
//= require jquery-ui/widgets/autocomplete.js
//= require jquery-ui/widgets/button.js
//= require jquery-ui/widgets/checkboxradio.js
//= require jquery-ui/widgets/controlgroup.js
//= require jquery-ui/widgets/datepicker.js
//= require jquery-ui/widgets/dialog.js
//= require jquery-ui/widgets/draggable.js
//= require jquery-ui/widgets/droppable.js
//= require jquery-ui/widgets/menu.js
//= require jquery-ui/widgets/mouse.js
//= require jquery-ui/widgets/progressbar.js
//= require jquery-ui/widgets/resizable.js
//= require jquery-ui/widgets/selectable.js
//= require jquery-ui/widgets/selectmenu.js
//= require jquery-ui/widgets/slider.js
//= require jquery-ui/widgets/sortable.js
//= require jquery-ui/widgets/spinner.js
//= require jquery-ui/widgets/tabs.js
//= require jquery-ui/widgets/tooltip.js
//= require jquery-ui/core
//= 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/keycode
//= require jquery-ui/labels
//= require jquery-ui/plugin
//= require jquery-ui/position
//= require jquery-ui/safe-active-element
//= require jquery-ui/safe-blur
//= require jquery-ui/scroll-parent
//= require jquery-ui/tabbable
//= require jquery-ui/unique-id
//= require jquery-ui/version
//= require jquery-ui/widget
//= require jquery-ui/effects/effect-blind
//= require jquery-ui/effects/effect-bounce
//= require jquery-ui/effects/effect-clip
//= require jquery-ui/effects/effect-drop
//= require jquery-ui/effects/effect-explode
//= require jquery-ui/effects/effect-fade
//= require jquery-ui/effects/effect-fold
//= require jquery-ui/effects/effect-highlight
//= require jquery-ui/effects/effect-puff
//= require jquery-ui/effects/effect-pulsate
//= require jquery-ui/effects/effect-scale
//= require jquery-ui/effects/effect-shake
//= require jquery-ui/effects/effect-size
//= require jquery-ui/effects/effect-slide
//= require jquery-ui/effects/effect-transfer
//= require jquery-ui/widgets/accordion
//= require jquery-ui/widgets/autocomplete
//= require jquery-ui/widgets/button
//= require jquery-ui/widgets/checkboxradio
//= require jquery-ui/widgets/controlgroup
//= require jquery-ui/widgets/datepicker
//= require jquery-ui/widgets/dialog
//= require jquery-ui/widgets/draggable
//= require jquery-ui/widgets/droppable
//= require jquery-ui/widgets/menu
//= require jquery-ui/widgets/mouse
//= require jquery-ui/widgets/progressbar
//= require jquery-ui/widgets/resizable
//= require jquery-ui/widgets/selectable
//= require jquery-ui/widgets/selectmenu
//= require jquery-ui/widgets/slider
//= require jquery-ui/widgets/sortable
//= require jquery-ui/widgets/spinner
//= require jquery-ui/widgets/tabs
//= require jquery-ui/widgets/tooltip
30 changes: 15 additions & 15 deletions app/assets/javascripts/jquery-ui/effect.all.js
View file
@@ -1,15 +1,15 @@
//= require jquery-ui/effects/effect-blind.js
//= require jquery-ui/effects/effect-bounce.js
//= require jquery-ui/effects/effect-clip.js
//= require jquery-ui/effects/effect-drop.js
//= require jquery-ui/effects/effect-explode.js
//= require jquery-ui/effects/effect-fade.js
//= require jquery-ui/effects/effect-fold.js
//= require jquery-ui/effects/effect-highlight.js
//= require jquery-ui/effects/effect-puff.js
//= require jquery-ui/effects/effect-pulsate.js
//= require jquery-ui/effects/effect-scale.js
//= require jquery-ui/effects/effect-shake.js
//= require jquery-ui/effects/effect-size.js
//= require jquery-ui/effects/effect-slide.js
//= require jquery-ui/effects/effect-transfer.js
//= require jquery-ui/effects/effect-blind
//= require jquery-ui/effects/effect-bounce
//= require jquery-ui/effects/effect-clip
//= require jquery-ui/effects/effect-drop
//= require jquery-ui/effects/effect-explode
//= require jquery-ui/effects/effect-fade
//= require jquery-ui/effects/effect-fold
//= require jquery-ui/effects/effect-highlight
//= require jquery-ui/effects/effect-puff
//= require jquery-ui/effects/effect-pulsate
//= require jquery-ui/effects/effect-scale
//= require jquery-ui/effects/effect-shake
//= require jquery-ui/effects/effect-size
//= require jquery-ui/effects/effect-slide
//= require jquery-ui/effects/effect-transfer
2 changes: 1 addition & 1 deletion jquery-ui-rails.gemspec
View file
Expand Up @@ -15,7 +15,7 @@ Gem::Specification.new do |s|

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

s.add_development_dependency "json", "~> 1.7"
s.add_development_dependency "json", "~> 2.0.2"

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

0 comments on commit 441a9eb

Please sign in to comment.