Skip to content
Extraits de code Groupes Projets
Valider ea674051 rédigé par Timo Besenreuther's avatar Timo Besenreuther
Parcourir les fichiers

refs #3530 proper line breaking of location in overlay sidebar in internet explorer

parent e8fda70b
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -52,7 +52,9 @@ var Piwik_Overlay = (function() { ...@@ -52,7 +52,9 @@ var Piwik_Overlay = (function() {
$location.html($responseLocation.html()).show(); $location.html($responseLocation.html()).show();
$responseLocation.remove(); $responseLocation.remove();
$location.find('span').hover(function () { var $locationSpan = $location.find('span');
$locationSpan.html(piwikHelper.addBreakpointsToUrl($locationSpan.text()));
$locationSpan.hover(function () {
if (iframeDomain) { if (iframeDomain) {
// use addBreakpointsToUrl because it also encoded html entities // use addBreakpointsToUrl because it also encoded html entities
Piwik_Tooltip.show('<b>' + Piwik_Overlay_Translations.domain + ':</b> ' + Piwik_Tooltip.show('<b>' + Piwik_Overlay_Translations.domain + ':</b> ' +
......
...@@ -55,8 +55,9 @@ var piwikHelper = { ...@@ -55,8 +55,9 @@ var piwikHelper = {
*/ */
addBreakpoints: function(text, breakpointMarkup) addBreakpoints: function(text, breakpointMarkup)
{ {
return text.replace(/([\/&=?\.%#:])/g, '$1' + return text.replace(/([\/&=?\.%#:_-])/g, '$1' +
(typeof breakpointMarkup == 'undefined' ? '<wbr>' : breakpointMarkup)); (typeof breakpointMarkup == 'undefined' ? '<wbr>&#8203;' : breakpointMarkup));
// &#8203; is for internet explorer
}, },
/** /**
...@@ -72,7 +73,7 @@ var piwikHelper = { ...@@ -72,7 +73,7 @@ var piwikHelper = {
} }
url = piwikHelper.addBreakpoints(url, '|||'); url = piwikHelper.addBreakpoints(url, '|||');
url = $(document.createElement('p')).text(url).html(); url = $(document.createElement('p')).text(url).html();
url = url.replace(/\|\|\|/g, '<wbr />'); url = url.replace(/\|\|\|/g, '<wbr />&#8203;'); // &#8203; is for internet explorer
return url; return url;
}, },
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter