Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-20 00:10:26 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

minor speed improvements or URL parsing

Browse source
This commit is contained in:
Misko Hevery 2010-07-30 11:45:52 -07:00
parent cdda664f89
commit 1e1c8c82f9
1 changed files with 18 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/services.js
View file

@ -24,7 +24,7 @@ angularService("$location", function(browser){
if (href) {
parseUrl(href);
} else {
href = check('href') || check('protocol', '://', 'host', ':', 'port', '', 'path', '?', 'search');
href = check('href') || checkProtocol();
var hash = check('hash');
if (isUndefined(hash)) hash = checkHashPathSearch();
if (isDefined(hash)) {
@ -38,19 +38,22 @@ angularService("$location", function(browser){
}
}
function check() {
var i = -1,
length=arguments.length,
name, seperator, parts = [],
value, same = true;
for(; i<length; i = i+2) {
parts.push(seperator = (arguments[i] || ''));
name = arguments[i + 1];
value=location[name];
parts.push(typeof value == 'object' ? toKeyValue(value) : value);
same = same && equals(lastLocation[name], value);
}
return same ? undefined : parts.join('');
function check(param) {
return lastLocation[param] == location[param] ? undefined : location[param];
}
function checkProtocol(){
if (lastLocation.protocol === location.protocol &&
lastLocation.host === location.host &&
lastLocation.port === location.port &&
lastLocation.path === location.path &&
equals(lastLocation.search, location.search))
return undefined;
var url = toKeyValue(location.search);
var port = (location.port == DEFAULT_PORTS[location.protocol] ? null : location.port);
return location.protocol + '://' + location.host +
(port ? ':' + port : '') + location.path +
(url ? '?' + url : '');
}
function checkHashPathSearch(){
@ -71,9 +74,7 @@ angularService("$location", function(browser){
location.port = match[5] || DEFAULT_PORTS[location.protocol] || null;
location.path = match[6];
location.search = parseKeyValue(match[8]);
location.hash = match[9] || '';
if (location.hash)
location.hash = location.hash.substr(1);
location.hash = match[10] || '';
match = HASH_MATCH.exec(location.hash);
location.hashPath = unescape(match[1] || '');
location.hashSearch = parseKeyValue(match[3]);