aurelia-path
Advanced tools
Comparing version 1.1.4 to 1.1.5
@@ -81,3 +81,7 @@ define(['exports'], function (exports) { | ||
if (url1[i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url1[i]); | ||
} | ||
} else if (url1[i] === '.' || url1[i] === '') { | ||
@@ -92,3 +96,7 @@ continue; | ||
if (url2[_i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url2[_i]); | ||
} | ||
} else if (url2[_i] === '.' || url2[_i] === '') { | ||
@@ -95,0 +103,0 @@ continue; |
@@ -89,3 +89,10 @@ | ||
if (url1[i] === '..') { | ||
url3.pop(); | ||
// retain leading .. | ||
// don't pop out previous .. | ||
// retain consecutive ../../.. | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url1[i]); | ||
} | ||
} else if (url1[i] === '.' || url1[i] === '') { | ||
@@ -100,3 +107,7 @@ continue; | ||
if (url2[i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url2[i]); | ||
} | ||
} else if (url2[i] === '.' || url2[i] === '') { | ||
@@ -103,0 +114,0 @@ continue; |
@@ -77,3 +77,7 @@ 'use strict'; | ||
if (url1[i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url1[i]); | ||
} | ||
} else if (url1[i] === '.' || url1[i] === '') { | ||
@@ -88,3 +92,7 @@ continue; | ||
if (url2[_i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url2[_i]); | ||
} | ||
} else if (url2[_i] === '.' || url2[_i] === '') { | ||
@@ -91,0 +99,0 @@ continue; |
@@ -65,3 +65,7 @@ | ||
if (url1[i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url1[i]); | ||
} | ||
} else if (url1[i] === '.' || url1[i] === '') { | ||
@@ -76,3 +80,7 @@ continue; | ||
if (url2[i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url2[i]); | ||
} | ||
} else if (url2[i] === '.' || url2[i] === '') { | ||
@@ -79,0 +87,0 @@ continue; |
@@ -66,3 +66,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol" ? function (obj) { return typeof obj; } : function (obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; | ||
if (url1[i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url1[i]); | ||
} | ||
} else if (url1[i] === '.' || url1[i] === '') { | ||
@@ -77,3 +81,7 @@ continue; | ||
if (url2[_i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url2[_i]); | ||
} | ||
} else if (url2[_i] === '.' || url2[_i] === '') { | ||
@@ -80,0 +88,0 @@ continue; |
@@ -73,3 +73,7 @@ 'use strict'; | ||
if (url1[i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url1[i]); | ||
} | ||
} else if (url1[i] === '.' || url1[i] === '') { | ||
@@ -84,3 +88,7 @@ continue; | ||
if (url2[_i] === '..') { | ||
url3.pop(); | ||
if (url3.length && url3[url3.length - 1] !== '..') { | ||
url3.pop(); | ||
} else { | ||
url3.push(url2[_i]); | ||
} | ||
} else if (url2[_i] === '.' || url2[_i] === '') { | ||
@@ -87,0 +95,0 @@ continue; |
@@ -0,1 +1,11 @@ | ||
<a name="1.1.5"></a> | ||
## [1.1.5](https://github.com/aurelia/path/compare/1.1.2...1.1.5) (2019-09-10) | ||
### Bug Fixes | ||
* **all:** change es2015 back to native-modules ([3a13e2f](https://github.com/aurelia/path/commit/3a13e2f)) | ||
<a name="1.1.4"></a> | ||
@@ -2,0 +12,0 @@ ## [1.1.4](https://github.com/aurelia/path/compare/1.1.2...1.1.4) (2019-03-26) |
{ | ||
"name": "aurelia-path", | ||
"version": "1.1.4", | ||
"version": "1.1.5", | ||
"description": "Utilities for path manipulation.", | ||
@@ -5,0 +5,0 @@ "keywords": [ |
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
License Policy Violation
LicenseThis package is not allowed per your license policy. Review the package's license to ensure compliance.
Found 1 instance in 1 package
65929
1501