Merge branch 'master' of https://github.com/piwik/piwik

plugins/Overlay/client/client.js

@@ -144,13 +144,9 @@ var Piwik_Overlay_Client = (function() {
 				notifyPiwikOfLocation();
 				loadCss();
 				
-				var finishLoadingOverlay = loading('Loading Piwik Page Overlay scripts');
-				
 				// translations
 				load('plugins/Overlay/client/translations.js', function() {
 					Piwik_Overlay_Translations.initialize(function() {
-						finishLoadingOverlay();
-						
 						// following pages
 						var finishPages = loading('Loading following pages');
 						load('plugins/Overlay/client/followingpages.js', function() {

plugins/Overlay/templates/index.js

@@ -52,7 +52,9 @@ var Piwik_Overlay = (function() {
                 $location.html($responseLocation.html()).show();
                 $responseLocation.remove();
 
-                $location.find('span').hover(function () {
+				var $locationSpan = $location.find('span');
+				$locationSpan.html(piwikHelper.addBreakpointsToUrl($locationSpan.text()));
+				$locationSpan.hover(function () {
                     if (iframeDomain) {
                         // use addBreakpointsToUrl because it also encoded html entities
                         Piwik_Tooltip.show('<b>' + Piwik_Overlay_Translations.domain + ':</b> ' +

themes/default/common.js

@@ -55,8 +55,9 @@ var piwikHelper = {
 	 */
 	addBreakpoints: function(text, breakpointMarkup)
 	{
-		return text.replace(/([\/&=?\.%#:])/g, '$1' +
-			(typeof breakpointMarkup == 'undefined' ? '<wbr>' : breakpointMarkup));
+		return text.replace(/([\/&=?\.%#:_-])/g, '$1' +
+			(typeof breakpointMarkup == 'undefined' ? '<wbr>&#8203;' : breakpointMarkup));
+			 // &#8203; is for internet explorer
 	},
 
 	/**
@@ -72,7 +73,7 @@ var piwikHelper = {
 		}
 		url = piwikHelper.addBreakpoints(url, '|||');
 		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;
 	},