[Git][noosfero/noosfero][master] 2 commits: piwik-plugin: support protocol on domain

[Rodrigo Souto]

Rodrigo Souto pushed to branch master at Noosfero / noosfero


Commits:
8025942d by Rodrigo Souto at 2017-07-27T16:39:10-03:00
piwik-plugin: support protocol on domain

- - - - -
d7055b81 by Rodrigo Souto at 2017-07-27T20:41:51+00:00
Merge branch 'piwik' into 'master'

piwik-plugin: support protocol on domain

See merge request !1284
- - - - -


3 changed files:

- plugins/piwik/lib/piwik_plugin.rb
- plugins/piwik/test/unit/piwik_plugin_test.rb
- plugins/piwik/views/tracking-code.rhtml → plugins/piwik/views/tracking-code.html.erb


Changes:

=====================================
plugins/piwik/lib/piwik_plugin.rb
=====================================
--- a/plugins/piwik/lib/piwik_plugin.rb
+++ b/plugins/piwik/lib/piwik_plugin.rb
@@ -19,7 +19,7 @@ class PiwikPlugin < Noosfero::Plugin
     unless domain.blank? || site_id.blank?
       piwik_url = "#{domain}/#{context.environment.piwik_path}"
       piwik_url = "#{piwik_url}/" unless piwik_url.end_with?('/')
-      expanded_template('tracking-code.rhtml', {:site_id => site_id, :piwik_url => piwik_url})
+      expanded_template('tracking-code.html.erb', {:site_id => site_id, :piwik_url => piwik_url})
     end
   end
 


=====================================
plugins/piwik/test/unit/piwik_plugin_test.rb
=====================================
--- a/plugins/piwik/test/unit/piwik_plugin_test.rb
+++ b/plugins/piwik/test/unit/piwik_plugin_test.rb
@@ -42,7 +42,7 @@ class PiwikPluginTest < ActiveSupport::TestCase
   should 'set default path to piwik' do
     @environment.piwik_domain = 'piwik.domain.example.com'
     @environment.piwik_site_id = 5
-    @plugin.expects(:expanded_template).with('tracking-code.rhtml', {:site_id => @environment.piwik_site_id, :piwik_url => "piwik.domain.example.com/piwik/"})
+    @plugin.expects(:expanded_template).with('tracking-code.html.erb', {:site_id => @environment.piwik_site_id, :piwik_url => "piwik.domain.example.com/piwik/"})
     @plugin.body_ending
   end
 
@@ -50,7 +50,7 @@ class PiwikPluginTest < ActiveSupport::TestCase
     @environment.piwik_domain = 'piwik.domain.example.com'
     @environment.piwik_path = ''
     @environment.piwik_site_id = 5
-    @plugin.expects(:expanded_template).with('tracking-code.rhtml', {:site_id => @environment.piwik_site_id, :piwik_url => "piwik.domain.example.com/"})
+    @plugin.expects(:expanded_template).with('tracking-code.html.erb', {:site_id => @environment.piwik_site_id, :piwik_url => "piwik.domain.example.com/"})
     @plugin.body_ending
   end
 


=====================================
plugins/piwik/views/tracking-code.rhtml → plugins/piwik/views/tracking-code.html.erb
=====================================
--- a/plugins/piwik/views/tracking-code.rhtml
+++ b/plugins/piwik/views/tracking-code.html.erb
@@ -4,7 +4,11 @@
   _paq.push(['trackPageView']);
   _paq.push(['enableLinkTracking']);
   (function() {
-    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://<%= escape_javascript locals[:piwik_url] %>";
+     var u = "<%= escape_javascript locals[:piwik_url] %>";
+     if(!u.match(/^https?/)){
+       var protocol = ("https:" == document.location.protocol ? "https" : "http");
+       u = protocol + '://' + u;
+     }
     _paq.push(['setTrackerUrl', u+'piwik.php']);
     _paq.push(['setSiteId', <%= escape_javascript locals[:site_id] %>]);
     var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/bfdb2cd6e16213c70b477ecada6232d0eb433a62...d7055b81653377276a7872678935087f1997f436

---
View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/bfdb2cd6e16213c70b477ecada6232d0eb433a62...d7055b81653377276a7872678935087f1997f436
You're receiving this email because of your account on gitlab.com.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20170727/20696fb1/attachment-0001.html>