@@ -22,21 +22,21 @@ function encodePath(path) {
22
22
return segments . join ( '/' ) ;
23
23
}
24
24
25
- function parseAbsoluteUrl ( absoluteUrl , locationObj , appBase ) {
26
- var parsedUrl = urlResolve ( absoluteUrl , appBase ) ;
25
+ function parseAbsoluteUrl ( absoluteUrl , locationObj ) {
26
+ var parsedUrl = urlResolve ( absoluteUrl ) ;
27
27
28
28
locationObj . $$protocol = parsedUrl . protocol ;
29
29
locationObj . $$host = parsedUrl . hostname ;
30
30
locationObj . $$port = int ( parsedUrl . port ) || DEFAULT_PORTS [ parsedUrl . protocol ] || null ;
31
31
}
32
32
33
33
34
- function parseAppUrl ( relativeUrl , locationObj , appBase ) {
34
+ function parseAppUrl ( relativeUrl , locationObj ) {
35
35
var prefixed = ( relativeUrl . charAt ( 0 ) !== '/' ) ;
36
36
if ( prefixed ) {
37
37
relativeUrl = '/' + relativeUrl ;
38
38
}
39
- var match = urlResolve ( relativeUrl , appBase ) ;
39
+ var match = urlResolve ( relativeUrl ) ;
40
40
locationObj . $$path = decodeURIComponent ( prefixed && match . pathname . charAt ( 0 ) === '/' ?
41
41
match . pathname . substring ( 1 ) : match . pathname ) ;
42
42
locationObj . $$search = parseKeyValue ( match . search ) ;
@@ -91,7 +91,7 @@ function LocationHtml5Url(appBase, basePrefix) {
91
91
this . $$html5 = true ;
92
92
basePrefix = basePrefix || '' ;
93
93
var appBaseNoFile = stripFile ( appBase ) ;
94
- parseAbsoluteUrl ( appBase , this , appBase ) ;
94
+ parseAbsoluteUrl ( appBase , this ) ;
95
95
96
96
97
97
/**
@@ -106,7 +106,7 @@ function LocationHtml5Url(appBase, basePrefix) {
106
106
appBaseNoFile ) ;
107
107
}
108
108
109
- parseAppUrl ( pathUrl , this , appBase ) ;
109
+ parseAppUrl ( pathUrl , this ) ;
110
110
111
111
if ( ! this . $$path ) {
112
112
this . $$path = '/' ;
@@ -169,7 +169,7 @@ function LocationHtml5Url(appBase, basePrefix) {
169
169
function LocationHashbangUrl ( appBase , hashPrefix ) {
170
170
var appBaseNoFile = stripFile ( appBase ) ;
171
171
172
- parseAbsoluteUrl ( appBase , this , appBase ) ;
172
+ parseAbsoluteUrl ( appBase , this ) ;
173
173
174
174
175
175
/**
@@ -189,7 +189,7 @@ function LocationHashbangUrl(appBase, hashPrefix) {
189
189
throw $locationMinErr ( 'ihshprfx' , 'Invalid url "{0}", missing hash prefix "{1}".' , url ,
190
190
hashPrefix ) ;
191
191
}
192
- parseAppUrl ( withoutHashUrl , this , appBase ) ;
192
+ parseAppUrl ( withoutHashUrl , this ) ;
193
193
194
194
this . $$path = removeWindowsDriveName ( this . $$path , withoutHashUrl , appBase ) ;
195
195
0 commit comments