Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthieu Aubry <matt@piwik.org>2014-09-08 03:41:52 +0400
committerMatthieu Aubry <matt@piwik.org>2014-09-08 03:41:52 +0400
commit0aecd47ca315aa556d967606aa7de37de577540e (patch)
tree927d3a3952051b025792c9fd8a54001f3dac695d /plugins/Morpheus
parent070f58ea124046e15d773f00aa4ca307a9dfe36d (diff)
parente7760f2405c70987a7c8f609bce40556090d0548 (diff)
Merge pull request #344 from Irrational86/master
Changed JavaScript Tracking Code generation to use "//"
Diffstat (limited to 'plugins/Morpheus')
-rw-r--r--plugins/Morpheus/templates/_piwikTag.twig4
-rw-r--r--plugins/Morpheus/templates/javascriptCode.tpl6
2 files changed, 5 insertions, 5 deletions
diff --git a/plugins/Morpheus/templates/_piwikTag.twig b/plugins/Morpheus/templates/_piwikTag.twig
index 98581d9ac5..84a459deb3 100644
--- a/plugins/Morpheus/templates/_piwikTag.twig
+++ b/plugins/Morpheus/templates/_piwikTag.twig
@@ -22,8 +22,8 @@
_paq.push(['enableJSErrorTracking']);
(function() {
- var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
- g.defer=true; g.async=true; g.src='js/piwik.js'; s.parentNode.insertBefore(g,s);
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+ g.type='text/javascript'; g.async=true; g.defer=true; g.src='js/piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
<!-- End Piwik Code -->
diff --git a/plugins/Morpheus/templates/javascriptCode.tpl b/plugins/Morpheus/templates/javascriptCode.tpl
index 488f39d00c..344e6d0311 100644
--- a/plugins/Morpheus/templates/javascriptCode.tpl
+++ b/plugins/Morpheus/templates/javascriptCode.tpl
@@ -7,9 +7,9 @@
{$setTrackerUrl}
_paq.push(['setTrackerUrl', u+'piwik.php']);
_paq.push(['setSiteId', {$idSite}]);
- var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
- g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+ g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
})();
</script>
-<noscript><p><img src="http://{$piwikUrl}/piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript>
+<noscript><p><img src="//{$piwikUrl}/piwik.php?idsite={$idSite}" style="border:0;" alt="" /></p></noscript>
<!-- End Piwik Code -->