Fixes piwik-analytics extension.

This commit is contained in:
Lars Jung
2012-09-14 15:32:33 +02:00
parent 9d8552a272
commit 1aec23008e
3 changed files with 36 additions and 41 deletions

View File

@@ -53,8 +53,7 @@ Run `makejs -t` to list all possible targets.
* localization now in separate files * localization now in separate files
* updates translations * updates translations
* adds `he` translation by [Tomer Cohen](https://github.com/tomer) * adds `he` translation by [Tomer Cohen](https://github.com/tomer)
* updates [jQuery](http://jquery.com) to 1.8.0 * updates 3rd party libs
* updates [HTML5 ★ Boilerplate](http://html5boilerplate.com) to 4.0.0
### v0.21 - *2012-08-06* ### v0.21 - *2012-08-06*

View File

@@ -195,10 +195,11 @@ var H5AI_CONFIG = {
/* [all] /* [all]
Adds Piwik tracker javascript code. Adds Piwik tracker javascript code.
baseURL without protocol
*/ */
"piwik-analytics": { "piwik-analytics": {
"enabled": false, "enabled": false,
"baseURL": "mydomain.tld/piwik", /* no protocol */ "baseURL": "mydomain.tld/piwik",
"idSite": 1 "idSite": 1
}, },

View File

@@ -1,38 +1,33 @@
modulejs.define('ext/piwik-analytics', ['_', 'core/settings'], function (_, allsettings) { modulejs.define('ext/piwik-analytics', ['_', '$', 'core/settings'], function (_, $, allsettings) {
var defaults = { var defaults = {
enabled: false, enabled: false,
"baseURL": "not-set", baseURL: 'not-set',
"idSite": 0 idSite: 0
}, },
template = function(baseURL, idSite) { settings = _.extend({}, defaults, allsettings['piwik-analytics']),
return '<script type="text/javascript"> init = function () {
var pkBaseURL = (("https:" == document.location.protocol) ? "https://'+baseURL+'" : "http://'+baseURL+'");
document.write(unescape("%3Cscript src='" + pkBaseURL + "piwik.js' type='text/javascript'%3E%3C/script%3E")); if (!settings.enabled) {
</script><script type="text/javascript"> return;
try { }
var piwikTracker = Piwik.getTracker(pkBaseURL + "piwik.php", '+idSite+');
piwikTracker.trackPageView(); // reference: http://piwik.org/docs/javascript-tracking/
piwikTracker.enableLinkTracking();
} catch( err ) {} var pkBaseURL = (("https:" === document.location.protocol) ? "https://" : "http://") + settings.baseURL + '/';
</script><noscript><p><img src="http://analytics.bluepyth.fr/piwik.php?idsite='+idSite+'" style="border:0" alt="" /></p></noscript>'
} $('<script/>').attr('src', pkBaseURL + 'piwik.js').appendTo('body');
$(window).load(function () {
settings = _.extend({}, defaults, allsettings['piwik-analytics']), /*global Piwik */
init = function () { var piwikTracker = Piwik.getTracker(pkBaseURL + 'piwik.php', settings.idSite);
piwikTracker.trackPageView();
if (!settings.enabled) { piwikTracker.enableLinkTracking();
return; });
} };
var $body = $('body'); init();
});
$body.append(template(settings.baseURL, settings.idSite));
};
init();
});