Comparing version 1.11.1 to 1.11.2
{ | ||
"name": "URIjs", | ||
"version": "1.11.1", | ||
"version": "1.11.2", | ||
"title": "URI.js - Mutating URLs", | ||
@@ -5,0 +5,0 @@ "author": { |
@@ -226,2 +226,7 @@ # URI.js # | ||
### 1.11.2 (August 14th 2013) ### | ||
* fixing regression for Node.js introduced by `fixing unsafe eval by using UMD's root` - ([Issue #107](https://github.com/medialize/URI.js/issues/107)) | ||
* fixing parser to accept malformed userinfo (non-encoded email address) - ([Issue #108](https://github.com/medialize/URI.js/issues/108)) | ||
### 1.11.1 (August 13th 2013) ### | ||
@@ -228,0 +233,0 @@ |
@@ -5,3 +5,3 @@ /*! | ||
* | ||
* Version: 1.11.1 | ||
* Version: 1.11.2 | ||
* | ||
@@ -40,3 +40,3 @@ * Author: Rodney Rehm | ||
// save current IPv6 variable, if any | ||
var _IPv6 = root.IPv6; | ||
var _IPv6 = root && root.IPv6; | ||
@@ -176,6 +176,7 @@ function best(address) { | ||
function noConflict(){ | ||
if (root.IPv6 === this) { | ||
root.IPv6 = _IPv6; | ||
} | ||
return this; | ||
if (root.IPv6 === this) { | ||
root.IPv6 = _IPv6; | ||
} | ||
return this; | ||
}; | ||
@@ -182,0 +183,0 @@ |
@@ -5,3 +5,3 @@ /*! | ||
* | ||
* Version: 1.11.1 | ||
* Version: 1.11.2 | ||
* | ||
@@ -8,0 +8,0 @@ * Author: Rodney Rehm |
@@ -5,3 +5,3 @@ /*! | ||
* | ||
* Version: 1.11.1 | ||
* Version: 1.11.2 | ||
* | ||
@@ -33,3 +33,3 @@ * Author: Rodney Rehm | ||
// save current SecondLevelDomains variable, if any | ||
var _SecondLevelDomains = root.SecondLevelDomains; | ||
var _SecondLevelDomains = root && root.SecondLevelDomains; | ||
@@ -36,0 +36,0 @@ var hasOwn = Object.prototype.hasOwnProperty; |
/*! | ||
* URI.js - Mutating URLs | ||
* | ||
* Version: 1.11.1 | ||
* Version: 1.11.2 | ||
* | ||
@@ -30,3 +30,3 @@ * Author: Rodney Rehm | ||
// save current URI variable, if any | ||
var _URI = root.URI; | ||
var _URI = root && root.URI; | ||
@@ -455,4 +455,6 @@ function URI(url, base) { | ||
// extract username:password | ||
var pos = string.indexOf('@'); | ||
var firstSlash = string.indexOf('/'); | ||
var pos = firstSlash > -1 | ||
? string.lastIndexOf('@', firstSlash) | ||
: string.indexOf('@'); | ||
var t; | ||
@@ -786,26 +788,25 @@ | ||
URI.noConflict = function(removeAll) { | ||
if(removeAll){ | ||
var unconflicted = { | ||
URI: this.noConflict() | ||
}; | ||
if (removeAll) { | ||
var unconflicted = { | ||
URI: this.noConflict() | ||
}; | ||
if(URITemplate && typeof URITemplate.noConflict == "function") { | ||
unconflicted.URITemplate = URITemplate.noConflict(); | ||
} | ||
if(IPv6 && typeof IPv6.noConflict == "function") { | ||
unconflicted.IPv6 = IPv6.noConflict(); | ||
} | ||
if(SecondLevelDomains && typeof SecondLevelDomains.noConflict == "function") { | ||
unconflicted.SecondLevelDomains = SecondLevelDomains.noConflict(); | ||
} | ||
if (URITemplate && typeof URITemplate.noConflict == "function") { | ||
unconflicted.URITemplate = URITemplate.noConflict(); | ||
} | ||
return unconflicted; | ||
} | ||
else { | ||
if (root.URI === this) { | ||
root.URI = _URI; | ||
if (IPv6 && typeof IPv6.noConflict == "function") { | ||
unconflicted.IPv6 = IPv6.noConflict(); | ||
} | ||
if (SecondLevelDomains && typeof SecondLevelDomains.noConflict == "function") { | ||
unconflicted.SecondLevelDomains = SecondLevelDomains.noConflict(); | ||
} | ||
return unconflicted; | ||
} else if (root.URI === this) { | ||
root.URI = _URI; | ||
} | ||
return this; | ||
} | ||
}; | ||
@@ -812,0 +813,0 @@ |
@@ -5,3 +5,3 @@ /*! | ||
* | ||
* Version: 1.11.1 | ||
* Version: 1.11.2 | ||
* | ||
@@ -32,3 +32,3 @@ * Author: Rodney Rehm | ||
// save current URITemplate variable, if any | ||
var _URITemplate = root.URITemplate; | ||
var _URITemplate = root && root.URITemplate; | ||
@@ -308,7 +308,7 @@ var hasOwn = Object.prototype.hasOwnProperty; | ||
URITemplate.noConflict = function() { | ||
if (root.URITemplate === URITemplate) { | ||
root.URITemplate = _URITemplate; | ||
} | ||
if (root.URITemplate === URITemplate) { | ||
root.URITemplate = _URITemplate; | ||
} | ||
return URITemplate; | ||
return URITemplate; | ||
}; | ||
@@ -315,0 +315,0 @@ |
135683
438
3132