chore(all): prepare release 0.4.6

aurelia · Mar 25, 2015 · c14994f · c14994f
1 parent 6fcd83a
commit c14994f
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 7 deletions.
diff --git a/README.md b/README.md
@@ -2,7 +2,7 @@
 
 This library is part of the [Aurelia](http://www.aurelia.io/) platform and contains utilities for path manipulation.
 
-> To keep up to date on [Aurelia](http://www.aurelia.io/), please visit and subscribe to [the official blog](http://blog.durandal.io/). If you have questions, we invite you to join us on [our Gitter Channel](https://gitter.im/aurelia/discuss).
+> To keep up to date on [Aurelia](http://www.aurelia.io/), please visit and subscribe to [the official blog](http://blog.durandal.io/). If you have questions, we invite you to join us on [![Join the chat at https://gitter.im/aurelia/discuss](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/aurelia/discuss?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge).
 
 ## Dependencies
 

diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-path",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Utilities for path manipulation.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -61,7 +61,7 @@ define(["exports"], function (exports) {
       return path1;
     }
 
-    urlPrefix = path1.indexOf("/") === 0 ? "/" : "";
+    urlPrefix = path1.indexOf("//") === 0 ? "//" : path1.indexOf("/") === 0 ? "/" : "";
 
     url1 = path1.split("/");
     url2 = path2.split("/");

diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -60,7 +60,7 @@ function join(path1, path2) {
     return path1;
   }
 
-  urlPrefix = path1.indexOf("/") === 0 ? "/" : "";
+  urlPrefix = path1.indexOf("//") === 0 ? "//" : path1.indexOf("/") === 0 ? "/" : "";
 
   url1 = path1.split("/");
   url2 = path2.split("/");

diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -55,7 +55,8 @@ export function join(path1, path2) {
     return path1;
   }
 
-  urlPrefix = path1.indexOf('/') === 0 ? '/' : '';
+  urlPrefix = path1.indexOf('//') === 0 ? '//' :
+              path1.indexOf('/') === 0 ? '/' : '';
 
   url1 = path1.split('/');
   url2 = path2.split('/');

diff --git a/dist/system/index.js b/dist/system/index.js
@@ -64,7 +64,7 @@ System.register([], function (_export) {
       return path1;
     }
 
-    urlPrefix = path1.indexOf("/") === 0 ? "/" : "";
+    urlPrefix = path1.indexOf("//") === 0 ? "//" : path1.indexOf("/") === 0 ? "/" : "";
 
     url1 = path1.split("/");
     url2 = path2.split("/");

diff --git a/doc/CHANGELOG.md b/doc/CHANGELOG.md
@@ -1,3 +1,11 @@
+### 0.4.6 (2015-03-24)
+
+
+#### Bug Fixes
+
+* **path:** Join protocol independent paths ([34655ae4](http://github.com/aurelia/path/commit/34655ae41d7d3495a84be25fce8866373e196c37))
+
+
 ### 0.4.5 (2015-02-28)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-path",
-  "version": "0.4.5",
+  "version": "0.4.6",
   "description": "Utilities for path manipulation.",
   "keywords": [
     "aurelia",