fix(join): add compiled js

aurelia · Apr 30, 2015 · 4662045 · 4662045
1 parent 3e7ed20
commit 4662045
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -55,6 +55,7 @@ define(['exports'], function (exports) {
     }
 
     urlPrefix = path1.indexOf('//') === 0 ? '//' : path1.indexOf('/') === 0 ? '/' : '';
+    trailingSlash = path2.slice(-1) == '/' ? '/' : '';
 
     url1 = path1.split('/');
     url2 = path2.split('/');
@@ -80,7 +81,7 @@ define(['exports'], function (exports) {
       }
     }
 
-    return urlPrefix + url3.join('/').replace(/\:\//g, '://');;
+    return urlPrefix + url3.join('/').replace(/\:\//g, '://') + trailingSlash;
   }
 
   var r20 = /%20/g,
@@ -133,4 +134,4 @@ define(['exports'], function (exports) {
       add(prefix, obj);
     }
   }
-});
+});
diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -54,6 +54,7 @@ function join(path1, path2) {
   }
 
   urlPrefix = path1.indexOf('//') === 0 ? '//' : path1.indexOf('/') === 0 ? '/' : '';
+  trailingSlash = path2.slice(-1) == '/' ? '/' : '';
 
   url1 = path1.split('/');
   url2 = path2.split('/');
@@ -79,7 +80,7 @@ function join(path1, path2) {
     }
   }
 
-  return urlPrefix + url3.join('/').replace(/\:\//g, '://');;
+  return urlPrefix + url3.join('/').replace(/\:\//g, '://') + trailingSlash;
 }
 
 var r20 = /%20/g,
@@ -131,4 +132,4 @@ function _buildQueryString(prefix, obj, traditional, add) {
   } else {
     add(prefix, obj);
   }
-}
+}
diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -57,6 +57,7 @@ export function join(path1, path2) {
 
   urlPrefix = path1.indexOf('//') === 0 ? '//' :
               path1.indexOf('/') === 0 ? '/' : '';
+  trailingSlash = path2.slice(-1) == '/' ? '/' : '';
 
   url1 = path1.split('/');
   url2 = path2.split('/');
@@ -82,7 +83,7 @@ export function join(path1, path2) {
     }
   }
 
-  return urlPrefix + url3.join('/').replace(/\:\//g, '://');;
+  return urlPrefix + url3.join('/').replace(/\:\//g, '://') + trailingSlash;
 }
 
 var r20 = /%20/g,

diff --git a/dist/system/index.js b/dist/system/index.js
@@ -55,6 +55,7 @@ System.register([], function (_export) {
     }
 
     urlPrefix = path1.indexOf('//') === 0 ? '//' : path1.indexOf('/') === 0 ? '/' : '';
+    trailingSlash = path2.slice(-1) == '/' ? '/' : '';
 
     url1 = path1.split('/');
     url2 = path2.split('/');
@@ -80,7 +81,7 @@ System.register([], function (_export) {
       }
     }
 
-    return urlPrefix + url3.join('/').replace(/\:\//g, '://');;
+    return urlPrefix + url3.join('/').replace(/\:\//g, '://') + trailingSlash;
   }
 
   function type(obj) {