Skip to content

Commit 2b0ca1d

Browse files
committed
Element and Utility exist in their own namespace.
1 parent 12fdb31 commit 2b0ca1d

File tree

4 files changed

+9
-11
lines changed

4 files changed

+9
-11
lines changed

lib/generators/rails_script/element/templates/javascript.js.coffee

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
window.App ||= {}
2-
window.App.Element ||= {}
3-
class App.Element.<%= element_name.gsub('::', '') %> <%= "extends App.Utility.#{utility.gsub('::', '')}" unless utility.blank? %>
1+
window.Element ||= {}
2+
class Element.<%= element_name.gsub('::', '') %> <%= "extends Utility.#{utility.gsub('::', '')}" unless utility.blank? %>
43

54
constructor: ->
65
super

lib/generators/rails_script/install/install_generator.rb

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,17 @@ def insert_load_order
1717
if File.exist?('app/assets/javascripts/application.js')
1818

1919
if File.readlines('app/assets/javascripts/application.js').grep('//= require_tree .').any?
20-
inject_into_file 'app/assets/javascripts/application.js', "\n//= require base\n//= require_tree ./utilities", before: "\n//= require_tree ."
20+
inject_into_file 'app/assets/javascripts/application.js', "\n//= require base\n//= require_tree ./utilities\n//= require_tree ./elements", before: "\n//= require_tree ."
2121
else
22-
append_file 'app/assets/javascripts/application.js', "\n//= require base\n//= require_tree ./utilities\n//= require_tree ."
22+
append_file 'app/assets/javascripts/application.js', "\n//= require base\n//= require_tree ./utilities\n//= require_tree ./elements\n//= require_tree ."
2323
end
2424

2525
elsif File.exist?('app/assets/javascripts/application.js.coffee')
2626

2727
if File.readlines('app/assets/javascripts/application.js.coffee').grep('#= require_tree .').any?
28-
inject_into_file 'app/assets/javascripts/application.js.coffee', "\n#= require base\n#= require_tree ./utilities", before: "\n#= require_tree ."
28+
inject_into_file 'app/assets/javascripts/application.js.coffee', "\n#= require base\n#= require_tree ./utilities\n#= require_tree ./elements", before: "\n#= require_tree ."
2929
else
30-
append_file 'app/assets/javascripts/application.js.coffee', "\n#= require base\n#= require_tree ./utilities\n#= require_tree ."
30+
append_file 'app/assets/javascripts/application.js.coffee', "\n#= require base\n#= require_tree ./utilities\n#= require_tree ./elements\n#= require_tree ."
3131
end
3232
end
3333
end

lib/generators/rails_script/utility/templates/javascript.js.coffee

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
1-
window.App ||= {}
2-
window.App.Utility ||= {}
3-
class App.Utility.<%= utility_name.gsub('::', '') %>
1+
window.Utility ||= {}
2+
class Utility.<%= utility_name.gsub('::', '') %>
43

54
constructor: ->
65
super

lib/rails_script/version.rb

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
module RailsScript
2-
VERSION = '0.1.0'
2+
VERSION = '0.1.1'
33
end

0 commit comments

Comments
 (0)