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:
authorBenaka Moorthi <benaka.moorthi@gmail.com>2013-09-23 05:43:22 +0400
committerBenaka Moorthi <benaka.moorthi@gmail.com>2013-09-23 05:43:22 +0400
commit1c805ec435aea2c18d83451eb682071ab0e9171b (patch)
treea40396ba6d6c3bb53b3dcbd16de166211a6d887f /plugins
parentc088040f866f88f1a7cf324825580122fe70309a (diff)
Fixing two bugs in image tracking link generator: only first & was replaced w/ &amp; in link and link text was never displayed.
Diffstat (limited to 'plugins')
-rw-r--r--plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js6
-rw-r--r--plugins/CoreAdminHome/templates/trackingCodeGenerator.twig2
2 files changed, 4 insertions, 4 deletions
diff --git a/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
index 2b0d7cfa83..cd54d1cf54 100644
--- a/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
+++ b/plugins/CoreAdminHome/javascripts/jsTrackingGenerator.js
@@ -250,8 +250,8 @@
<img src="' + piwikURL + '?' + $.param(params) + '" style="border:0" alt="" />\n\
<!-- End Piwik -->';
- result = result.replace("&", "&amp;", "g");
- $('#image-tracking-link').find('textarea').val(result);
+ result = result.replace(/[&]/g, "&amp;");
+ $('#image-tracking-text').find('textarea').val(result);
};
// on image link tracker site change, change available goals
@@ -318,7 +318,7 @@
});
// on click generated code textareas, select the text so it can be easily copied
- $('#javascript-text>textarea,#image-tracking-link>textarea').click(function () {
+ $('#javascript-text>textarea,#image-tracking-text>textarea').click(function () {
$(this).select();
});
diff --git a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
index 103d8bc874..52aa5527da 100644
--- a/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
+++ b/plugins/CoreAdminHome/templates/trackingCodeGenerator.twig
@@ -242,7 +242,7 @@
<div id="image-link-output-section" width="560px">
<h3>{{ 'CoreAdminHome_ImageTrackingLink'|translate }}</h3><br/><br/>
- <div id="image-tracking-link">
+ <div id="image-tracking-text">
<textarea> </textarea>
</div>
<br/>