lib/middleman-google-analytics/analytics.js.erb in middleman-google-analytics-2.1.1 vs lib/middleman-google-analytics/analytics.js.erb in middleman-google-analytics-3.0.0

- old
+ new

@@ -1,19 +1,25 @@ <% - file = @options.debug ? 'u/ga_debug' : 'ga' - pluginUrl = '//www.google-analytics.com/plugins/ga/inpage_linkid.js' + script = if @options.debug || @options.debug_trace || @options.test + 'analytics_debug.js' + else + 'analytics.js' + end - gaq = [] - gaq << ['_setAccount', "#{@options.tracking_id}"] - gaq << ['_setDomainName', "#{@options.domain_name}"] if @options.domain_name - gaq << ['_setAllowLinker', true] if @options.allow_linker - gaq << ['_gat._anonymizeIp'] if @options.anonymize_ip - gaq << ['_require', 'inpage_linkid', pluginUrl] if @options.enhanced_link_attribution - gaq << ['_trackPageview'] + create_options = [] + create_options << "'#{@options.tracking_id}'" + create_options << "'#{@options.domain_name || :auto}'" + create_options << "{'allowLinker': true}" if @options.allow_linker + + ga = [] + ga << "window.ga_debug = {trace: true};" if @options.debug_trace + ga << "ga('create', #{create_options.join(', ')});" + ga << "ga('set', 'sendHitTask', null);" if @options.test + ga << "ga('set', 'anonymizeIp', true);" if @options.anonymize_ip + ga << "ga('require', 'linkid');" if @options.enhanced_link_attribution + ga << "ga('send', 'pageview');" %> -var _gaq = _gaq || []; -<%= gaq.map! { |x| "_gaq.push(#{x});" }.join("\n") %> -(function() { - var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true; - ga.src = ('https:' == document.location.protocol ? '//ssl' : '//www') + '.google-analytics.com/<%= file %>.js'; - var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s); -})(); +(function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){ +(i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o), +m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m) +})(window,document,'script','//www.google-analytics.com/<%= script %>','ga'); +<%= ga.join("\n") %>