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

88
www/analytics/plugins/Goals/javascripts/goalsForm.js
View file

@ -1,5 +1,5 @@
/*!
* Piwik - Web Analytics
* Piwik - free/libre analytics platform
*
* @link http://piwik.org
* @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later
@ -9,14 +9,15 @@ function showAddNewGoal() {
hideForms();
$(".entityAddContainer").show();
showCancel();
hideCreateGoal();
piwikHelper.lazyScrollTo(".entityContainer", 400);
return false;
}
function showEditGoals() {
hideForms();
showCreateGoal();
$("#entityEditContainer").show();
showCancel();
piwikHelper.lazyScrollTo(".entityContainer", 400);
return false;
}
@ -31,9 +32,37 @@ function showCancel() {
$('.entityCancelLink').click(function () {
hideForms();
$(".entityCancel").hide();
showEditGoals();
});
}
function showCreateGoal() {
$("#add-goal").show();
}
function hideCreateGoal() {
$("#add-goal").hide();
}
function onMatchAttributeChange(matchAttribute)
{
if ('event' === matchAttribute) {
$('.entityAddContainer .whereEvent').show();
$('.entityAddContainer .whereUrl').hide();
} else {
$('.entityAddContainer .whereEvent').hide();
$('.entityAddContainer .whereUrl').show();
}
$('#match_attribute_name').html(mappingMatchTypeName[matchAttribute]);
$('#examples_pattern').html(mappingMatchTypeExamples[matchAttribute]);
}
function updateMatchAttribute () {
var matchTypeId = $(this).val();
onMatchAttributeChange(matchTypeId);
}
// init the goal form with existing goal value, if any
function initGoalForm(goalMethodAPI, submitText, goalName, matchAttribute, pattern, patternType, caseSensitive, revenue, allowMultiple, goalId) {
$('#goal_name').val(goalName);
@ -41,11 +70,20 @@ function initGoalForm(goalMethodAPI, submitText, goalName, matchAttribute, patte
$('select[name=trigger_type] option[value=manually]').prop('selected', true);
$('input[name=match_attribute]').prop('disabled', true);
$('#match_attribute_section').hide();
$('#match_attribute_section2').hide();
$('#manual_trigger_section').show();
matchAttribute = 'url';
} else {
$('select[name=trigger_type] option[value=visitors]').prop('selected', true);
}
if (0 === matchAttribute.indexOf('event')) {
$('select[name=event_type] option[value=' + matchAttribute + ']').prop('selected', true);
matchAttribute = 'event';
}
onMatchAttributeChange(matchAttribute);
$('input[name=match_attribute][value=' + matchAttribute + ']').prop('checked', true);
$('input[name=allow_multiple][value=' + allowMultiple + ']').prop('checked', true);
$('#match_attribute_name').html(mappingMatchTypeName[matchAttribute]);
@ -59,27 +97,35 @@ function initGoalForm(goalMethodAPI, submitText, goalName, matchAttribute, patte
if (goalId != undefined) {
$('input[name=goalIdUpdate]').val(goalId);
}
// force re-run of iCheck. They were already initialized with all radio fields not selected. see #5961
$('.entityAddContainer div.form-radio').removeClass('form-radio');
$(document).trigger('Goals.edit', {});
}
function bindGoalForm() {
$('select[name=trigger_type]').click(function () {
$('select[name=trigger_type]').change(function () {
var triggerTypeId = $(this).val();
if (triggerTypeId == "manually") {
$('input[name=match_attribute]').prop('disabled', true);
$('#match_attribute_section').hide();
$('#match_attribute_section2').hide();
$('#manual_trigger_section').show();
} else {
$('input[name=match_attribute]').removeProp('disabled');
$('#match_attribute_section').show();
$('#match_attribute_section2').show();
$('#manual_trigger_section').hide();
// force re-run of iCheck
$('.entityAddContainer div.form-radio').removeClass('form-radio');
$(document).trigger('Goals.edit', {});
}
});
$('input[name=match_attribute]').click(function () {
var matchTypeId = $(this).val();
$('#match_attribute_name').html(mappingMatchTypeName[matchTypeId]);
$('#examples_pattern').html(mappingMatchTypeExamples[matchTypeId]);
$(document).bind('Goals.edit', function () {
$('input[name=match_attribute]').off('change', updateMatchAttribute);
$('input[name=match_attribute]').change(updateMatchAttribute);
});
$('#goal_submit').click(function () {
@ -88,7 +134,7 @@ function bindGoalForm() {
return false;
});
$('a[name=linkAddNewGoal]').click(function () {
$('#add-goal').click(function () {
initAndShowAddGoalForm();
piwikHelper.lazyScrollTo('#goal_name');
});
@ -123,6 +169,11 @@ function ajaxAddGoal() {
parameters.caseSensitive = 0;
} else {
parameters.matchAttribute = $('input[name=match_attribute]:checked').val();
if (parameters.matchAttribute === 'event') {
parameters.matchAttribute = $('select[name=event_type]').val();
}
parameters.patternType = $('[name=pattern_type]').val();
parameters.pattern = encodeURIComponent($('input[name=pattern]').val());
parameters.caseSensitive = $('#case_sensitive').prop('checked') == true ? 1 : 0;
@ -138,20 +189,27 @@ function ajaxAddGoal() {
var ajaxRequest = new ajaxHelper();
ajaxRequest.addParams(parameters, 'get');
ajaxRequest.setLoadingElement('#goalAjaxLoading');
ajaxRequest.setCallback(function () { location.reload(); });
ajaxRequest.setCallback(function () {
location.reload();
});
ajaxRequest.send(true);
}
function editGoal(goalId)
{
var goal = piwik.goals[goalId];
initGoalForm("Goals.updateGoal", _pk_translate('Goals_UpdateGoal'), goal.name, goal.match_attribute, goal.pattern, goal.pattern_type, (goal.case_sensitive != '0'), goal.revenue, goal.allow_multiple, goalId);
showAddNewGoal();
}
function bindListGoalEdit() {
$('a[name=linkEditGoal]').click(function () {
$('.edit-goal').click(function () {
var goalId = $(this).attr('id');
var goal = piwik.goals[goalId];
initGoalForm("Goals.updateGoal", _pk_translate('Goals_UpdateGoal'), goal.name, goal.match_attribute, goal.pattern, goal.pattern_type, (goal.case_sensitive != '0'), goal.revenue, goal.allow_multiple, goalId);
showAddNewGoal();
editGoal(goalId);
return false;
});
$('a[name=linkDeleteGoal]').click(function () {
$('.delete-goal').click(function () {
var goalId = $(this).attr('id');
var goal = piwik.goals[goalId];