From 0f07f70b532db086d4ef2a5c0ff4d0e3d539d5ab Mon Sep 17 00:00:00 2001 From: ROUL Date: Sun, 10 Nov 2013 02:25:33 +0100 Subject: [PATCH 1/4] Issue #4680 --- src/ng/urlUtils.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/ng/urlUtils.js b/src/ng/urlUtils.js index e821c08a3e9f..bd0ca1cd32b4 100644 --- a/src/ng/urlUtils.js +++ b/src/ng/urlUtils.js @@ -81,7 +81,8 @@ function urlResolve(url) { hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', hostname: urlParsingNode.hostname, port: urlParsingNode.port, - pathname: urlParsingNode.pathname && urlParsingNode.pathname.charAt(0) === '/' ? + pathname: (urlParsingNode.protocol.indexOf('file')===0 && urlParsingNode.pathname.indexOf('\:')===2)? + urlParsingNode.pathname.substring(3) : urlParsingNode.pathname.charAt(0) === '/' ? urlParsingNode.pathname : '/' + urlParsingNode.pathname }; } From acf68d083411af923153298fbdc0cac9f23ed26b Mon Sep 17 00:00:00 2001 From: ROUL Date: Mon, 11 Nov 2013 23:08:35 +0100 Subject: [PATCH 2/4] Update after Travis build --- src/ng/urlUtils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ng/urlUtils.js b/src/ng/urlUtils.js index bd0ca1cd32b4..e16f14edaad6 100644 --- a/src/ng/urlUtils.js +++ b/src/ng/urlUtils.js @@ -81,8 +81,8 @@ function urlResolve(url) { hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', hostname: urlParsingNode.hostname, port: urlParsingNode.port, - pathname: (urlParsingNode.protocol.indexOf('file')===0 && urlParsingNode.pathname.indexOf('\:')===2)? - urlParsingNode.pathname.substring(3) : urlParsingNode.pathname.charAt(0) === '/' ? + pathname: (urlParsingNode.protocol.indexOf('file')===0 && urlParsingNode.pathname.indexOf(':')===2)? + urlParsingNode.pathname.substring(3) : urlParsingNode.pathname.charAt(0) === '/' ? urlParsingNode.pathname : '/' + urlParsingNode.pathname }; } From d4c90277f8e88cf616ee1e0778c5233ad5929751 Mon Sep 17 00:00:00 2001 From: ROUL Date: Mon, 11 Nov 2013 23:21:24 +0100 Subject: [PATCH 3/4] Update urlUtils.js --- src/ng/urlUtils.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ng/urlUtils.js b/src/ng/urlUtils.js index e16f14edaad6..bd0ca1cd32b4 100644 --- a/src/ng/urlUtils.js +++ b/src/ng/urlUtils.js @@ -81,8 +81,8 @@ function urlResolve(url) { hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', hostname: urlParsingNode.hostname, port: urlParsingNode.port, - pathname: (urlParsingNode.protocol.indexOf('file')===0 && urlParsingNode.pathname.indexOf(':')===2)? - urlParsingNode.pathname.substring(3) : urlParsingNode.pathname.charAt(0) === '/' ? + pathname: (urlParsingNode.protocol.indexOf('file')===0 && urlParsingNode.pathname.indexOf('\:')===2)? + urlParsingNode.pathname.substring(3) : urlParsingNode.pathname.charAt(0) === '/' ? urlParsingNode.pathname : '/' + urlParsingNode.pathname }; } From d1795fe62939b84eebc379bd5d437329af4e8665 Mon Sep 17 00:00:00 2001 From: ROUL Date: Mon, 11 Nov 2013 23:30:41 +0100 Subject: [PATCH 4/4] Update urlUtils.js --- src/ng/urlUtils.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ng/urlUtils.js b/src/ng/urlUtils.js index bd0ca1cd32b4..5286a5ac7e99 100644 --- a/src/ng/urlUtils.js +++ b/src/ng/urlUtils.js @@ -81,9 +81,9 @@ function urlResolve(url) { hash: urlParsingNode.hash ? urlParsingNode.hash.replace(/^#/, '') : '', hostname: urlParsingNode.hostname, port: urlParsingNode.port, - pathname: (urlParsingNode.protocol.indexOf('file')===0 && urlParsingNode.pathname.indexOf('\:')===2)? - urlParsingNode.pathname.substring(3) : urlParsingNode.pathname.charAt(0) === '/' ? - urlParsingNode.pathname : '/' + urlParsingNode.pathname + pathname: (urlParsingNode.protocol.indexOf('file')===0 && urlParsingNode.pathname.indexOf(':')===2)? + urlParsingNode.pathname.substring(3) : (urlParsingNode.pathname.charAt(0) === '/' ? + urlParsingNode.pathname : '/' + urlParsingNode.pathname) }; }