coderkun/questlab
1
0
Fork 0
Code Issues 15 Pull requests Projects Releases Wiki Activity

update Piwik to version 2.16 (fixes #91)

Browse source
This commit is contained in:
oliver 2016-04-10 18:55:57 +02:00
commit d885a4baa9
5833 changed files with 418860 additions and 226988 deletions
Download patch file Download diff file Expand all files Collapse all files

47
www/analytics/plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
View file

@ -1,5 +1,5 @@
/**
* Piwik - Web Analytics
* Piwik - free/libre analytics platform
*
* DataTable UI class for JqplotGraph/Evolution.
*
@ -22,7 +22,7 @@
_setJqplotParameters: function (params) {
JqplotGraphDataTablePrototype._setJqplotParameters.call(this, params);
var defaultParams = {
axes: {
xaxis: {
@ -89,6 +89,41 @@
if (lastTick !== false && typeof self.jqplotParams.axes.xaxis.onclick != 'undefined'
&& typeof self.jqplotParams.axes.xaxis.onclick[lastTick] == 'string') {
var url = self.jqplotParams.axes.xaxis.onclick[lastTick];
if (url && -1 === url.indexOf('#')) {
var module = broadcast.getValueFromHash('module');
var action = broadcast.getValueFromHash('action');
var idGoal = broadcast.getValueFromHash('idGoal');
var idDimension = broadcast.getValueFromHash('idDimension');
var idSite = broadcast.getValueFromUrl('idSite', url);
var period = broadcast.getValueFromUrl('period', url);
var date = broadcast.getValueFromUrl('date', url);
if (module && action) {
url += '#module=' + module + '&action=' + action;
if (idSite) {
url += '&idSite=' + idSite;
}
if (idGoal) {
url += '&idGoal=' + idGoal;
}
if (idDimension) {
url += '&idDimension=' + idDimension;
}
if (period) {
url += '&period=' + period;
}
if (period) {
url += '&date=' + date;
}
}
}
piwikHelper.redirectToUrl(url);
}
})
@ -100,17 +135,19 @@
} else {
label = self.jqplotParams.axes.xaxis.ticks[tick];
}
var text = [];
for (var d = 0; d < self.data.length; d++) {
var value = self.formatY(self.data[d][tick], d);
var series = self.jqplotParams.series[d].label;
text.push('<strong>' + value + '</strong> ' + series);
text.push('<strong>' + value + '</strong> ' + piwikHelper.htmlEntities(series));
}
var content = '<h3>'+piwikHelper.htmlEntities(label)+'</h3>'+text.join('<br />');
$(this).tooltip({
track: true,
items: 'div',
content: '<h3>'+label+'</h3>'+text.join('<br />'),
content: content,
show: false,
hide: false
}).trigger('mouseover');