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:
-rw-r--r--plugins/Transitions/templates/transitions.css4
-rw-r--r--plugins/Transitions/templates/transitions.js2
-rw-r--r--themes/default/common.js6
3 files changed, 8 insertions, 4 deletions
diff --git a/plugins/Transitions/templates/transitions.css b/plugins/Transitions/templates/transitions.css
index 6a0ab4359e..75ecacb825 100644
--- a/plugins/Transitions/templates/transitions.css
+++ b/plugins/Transitions/templates/transitions.css
@@ -45,9 +45,9 @@
}
#Transitions_CenterBox {
- margin: 60px 0 0 345px;
+ margin: 27px 0 0 345px;
width: 208px;
- height: 354px;
+ height: 373px;
background: #f7f7f7;
border: 1px solid #a9a399;
border-radius:10px;
diff --git a/plugins/Transitions/templates/transitions.js b/plugins/Transitions/templates/transitions.js
index a55fa8850e..f37788ec3c 100644
--- a/plugins/Transitions/templates/transitions.js
+++ b/plugins/Transitions/templates/transitions.js
@@ -209,7 +209,7 @@ Piwik_Transitions.prototype.preparePopover = function() {
title = self.centerBox.find('h2')
.addClass('Transitions_ApplyTextAndTruncate')
.data('text', title)
- .data('maxLines', 4);
+ .data('maxLines', 3);
if (self.actionType == 'url') {
title.click(function() {
diff --git a/themes/default/common.js b/themes/default/common.js
index 18ce90f41a..0575ea133b 100644
--- a/themes/default/common.js
+++ b/themes/default/common.js
@@ -36,7 +36,11 @@ var piwikHelper = {
*/
addBreakpointsToUrl: function(url)
{
- url = decodeURIComponent(url);
+ try {
+ url = decodeURIComponent(url);
+ } catch (e) {
+ // might throw "URI malformed"
+ }
url = piwikHelper.addBreakpoints(url, '|||');
url = $(document.createElement('p')).text(url).html();
url = url.replace(/\|\|\|/g, '<wbr />');