Skip to content

Commit

Permalink
Added support for javascript helpers
Browse files Browse the repository at this point in the history
Enabled by default, disable with :javascript_helpers=>false
  • Loading branch information
jkrall committed Aug 7, 2011
1 parent 1f1eed2 commit d7ddc98
Show file tree
Hide file tree
Showing 4 changed files with 27 additions and 14 deletions.
11 changes: 11 additions & 0 deletions app/views/application/_analytical_javascript.html.erb
@@ -0,0 +1,11 @@
<script type="text/javascript">
var Analytical = {
track: function(page) {
<%= raw analytical.now.track('__PAGE__').gsub(/"__PAGE__"/,'page') %>
},
event: function(name, data) {
if (typeof data === 'undefined') { data = {}; }
<%= raw analytical.now.event('__EVENT__', {}).gsub(/"__EVENT__"/,'name').gsub(/"?\{\}"?/,'data') %>
}
};
</script>
1 change: 1 addition & 0 deletions lib/analytical.rb
Expand Up @@ -45,6 +45,7 @@ def analytical
if analytical_is_robot?(request.user_agent)
options[:modules] = []
end
options[:javascript_helpers] ||= true
Analytical::Api.new options
end
end
Expand Down
16 changes: 15 additions & 1 deletion lib/analytical/api.rb
Expand Up @@ -67,7 +67,21 @@ def head_prepend_javascript
end

def head_append_javascript
[init_javascript(:head_append), tracking_javascript(:head_append)].delete_if{|s| s.blank?}.join("\n")
js = [
init_javascript(:head_append),
tracking_javascript(:head_append),
]

if options[:javascript_helpers]
if Rails::VERSION::MAJOR >= 3 && Rails::VERSION::MINOR >= 1 # Rails 3.1 lets us override views in engines
js << options[:controller].send(:render_to_string, :partial=>'analytical_javascript') if options[:controller]
else # All other rails
_partial_path = Pathname.new(__FILE__).dirname.join('..', '..', 'app/views/application', 'analytical_javascript.html.erb').to_s
js << options[:controller].send(:render_to_string, :partial=>_partial_path) if options[:controller]
end
end

js.delete_if{|s| s.blank?}.join("\n")
end

alias_method :head_javascript, :head_append_javascript
Expand Down
13 changes: 0 additions & 13 deletions vendor/assets/analytical.js.erb

This file was deleted.

0 comments on commit d7ddc98

Please sign in to comment.