chore(all): prepare release 0.2.0

aurelia · Jan 6, 2015 · 304995b · 304995b
1 parent ff2a572
commit 304995b
Show file tree

Hide file tree

Showing 8 changed files with 302 additions and 77 deletions.
diff --git a/bower.json b/bower.json
@@ -1,6 +1,6 @@
 {
   "name": "aurelia-history-browser",
-  "version": "0.1.1",
+  "version": "0.2.0",
   "description": "An implementation of the Aurelia history interface based on standard browser hash change and push state mechanisms.",
   "keywords": [
     "aurelia",

diff --git a/dist/amd/index.js b/dist/amd/index.js
@@ -1,16 +1,19 @@
 define(["exports", "aurelia-history"], function (exports, _aureliaHistory) {
   "use strict";
 
-  var _extends = function (child, parent) {
-    child.prototype = Object.create(parent.prototype, {
+  var _inherits = function (child, parent) {
+    if (typeof parent !== "function" && parent !== null) {
+      throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+    }
+    child.prototype = Object.create(parent && parent.prototype, {
       constructor: {
         value: child,
         enumerable: false,
         writable: true,
         configurable: true
       }
     });
-    child.__proto__ = parent;
+    if (parent) child.__proto__ = parent;
   };
 
   var History = _aureliaHistory.History;
@@ -31,23 +34,8 @@ define(["exports", "aurelia-history"], function (exports, _aureliaHistory) {
     }
   }
 
-  function extend(obj) {
-    var rest = Array.prototype.slice.call(arguments, 1);
-
-    for (var i = 0, length = rest.length; i < length; i++) {
-      var source = rest[i];
-
-      if (source) {
-        for (var prop in source) {
-          obj[prop] = source[prop];
-        }
-      }
-    }
-
-    return obj;
-  }
-
-  var BrowserHistory = (function (History) {
+  var BrowserHistory = (function () {
+    var _History = History;
     var BrowserHistory = function BrowserHistory() {
       this.interval = 50;
       this.active = false;
@@ -60,18 +48,20 @@ define(["exports", "aurelia-history"], function (exports, _aureliaHistory) {
       }
     };
 
-    _extends(BrowserHistory, History);
+    _inherits(BrowserHistory, _History);
 
     BrowserHistory.prototype.getHash = function (window) {
       var match = (window || this).location.href.match(/#(.*)$/);
       return match ? match[1] : "";
     };
 
     BrowserHistory.prototype.getFragment = function (fragment, forcePushState) {
+      var root;
+
       if (!fragment) {
         if (this._hasPushState || !this._wantsHashChange || forcePushState) {
           fragment = this.location.pathname + this.location.search;
-          var root = this.root.replace(trailingSlash, "");
+          root = this.root.replace(trailingSlash, "");
           if (!fragment.indexOf(root)) {
             fragment = fragment.substr(root.length);
           }
@@ -90,7 +80,7 @@ define(["exports", "aurelia-history"], function (exports, _aureliaHistory) {
 
       this.active = true;
 
-      this.options = extend({}, { root: "/" }, this.options, options);
+      this.options = Object.assign({}, { root: "/" }, this.options, options);
       this.root = this.options.root;
       this._wantsHashChange = this.options.hashChange !== false;
       this._wantsPushState = !!this.options.pushState;
@@ -102,7 +92,7 @@ define(["exports", "aurelia-history"], function (exports, _aureliaHistory) {
 
       if (this._hasPushState) {
         window.onpopstate = this._checkUrlCallback;
-      } else if (this._wantsHashChange && ("onhashchange" in window)) {
+      } else if (this._wantsHashChange && "onhashchange" in window) {
         window.addEventListener("hashchange", this._checkUrlCallback);
       } else if (this._wantsHashChange) {
         this._checkUrlInterval = setInterval(this._checkUrlCallback, this.interval);
@@ -199,7 +189,7 @@ define(["exports", "aurelia-history"], function (exports, _aureliaHistory) {
       } else if (this._wantsHashChange) {
         updateHash(this.location, fragment, options.replace);
 
-        if (this.iframe && (fragment !== this.getFragment(this.getHash(this.iframe)))) {
+        if (this.iframe && fragment !== this.getFragment(this.getHash(this.iframe))) {
           if (!options.replace) {
             this.iframe.document.open().close();
           }
@@ -222,7 +212,12 @@ define(["exports", "aurelia-history"], function (exports, _aureliaHistory) {
     };
 
     return BrowserHistory;
-  })(History);
+  })();
+
+  function install(aurelia) {
+    aurelia.withSingleton(History, BrowserHistory);
+  }
 
   exports.BrowserHistory = BrowserHistory;
+  exports.install = install;
 });
diff --git a/dist/commonjs/index.js b/dist/commonjs/index.js
@@ -1,18 +1,21 @@
 "use strict";
 
-var _extends = function (child, parent) {
-  child.prototype = Object.create(parent.prototype, {
+var _inherits = function (child, parent) {
+  if (typeof parent !== "function" && parent !== null) {
+    throw new TypeError("Super expression must either be null or a function, not " + typeof parent);
+  }
+  child.prototype = Object.create(parent && parent.prototype, {
     constructor: {
       value: child,
       enumerable: false,
       writable: true,
       configurable: true
     }
   });
-  child.__proto__ = parent;
+  if (parent) child.__proto__ = parent;
 };
 
-var History = require('aurelia-history').History;
+var History = require("aurelia-history").History;
 var routeStripper = /^[#\/]|\s+$/g;
 
 var rootStripper = /^\/+|\/+$/g;
@@ -30,23 +33,8 @@ function updateHash(location, fragment, replace) {
   }
 }
 
-function extend(obj) {
-  var rest = Array.prototype.slice.call(arguments, 1);
-
-  for (var i = 0, length = rest.length; i < length; i++) {
-    var source = rest[i];
-
-    if (source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
-      }
-    }
-  }
-
-  return obj;
-}
-
-var BrowserHistory = (function (History) {
+var BrowserHistory = (function () {
+  var _History = History;
   var BrowserHistory = function BrowserHistory() {
     this.interval = 50;
     this.active = false;
@@ -59,18 +47,20 @@ var BrowserHistory = (function (History) {
     }
   };
 
-  _extends(BrowserHistory, History);
+  _inherits(BrowserHistory, _History);
 
   BrowserHistory.prototype.getHash = function (window) {
     var match = (window || this).location.href.match(/#(.*)$/);
     return match ? match[1] : "";
   };
 
   BrowserHistory.prototype.getFragment = function (fragment, forcePushState) {
+    var root;
+
     if (!fragment) {
       if (this._hasPushState || !this._wantsHashChange || forcePushState) {
         fragment = this.location.pathname + this.location.search;
-        var root = this.root.replace(trailingSlash, "");
+        root = this.root.replace(trailingSlash, "");
         if (!fragment.indexOf(root)) {
           fragment = fragment.substr(root.length);
         }
@@ -89,7 +79,7 @@ var BrowserHistory = (function (History) {
 
     this.active = true;
 
-    this.options = extend({}, { root: "/" }, this.options, options);
+    this.options = Object.assign({}, { root: "/" }, this.options, options);
     this.root = this.options.root;
     this._wantsHashChange = this.options.hashChange !== false;
     this._wantsPushState = !!this.options.pushState;
@@ -101,7 +91,7 @@ var BrowserHistory = (function (History) {
 
     if (this._hasPushState) {
       window.onpopstate = this._checkUrlCallback;
-    } else if (this._wantsHashChange && ("onhashchange" in window)) {
+    } else if (this._wantsHashChange && "onhashchange" in window) {
       window.addEventListener("hashchange", this._checkUrlCallback);
     } else if (this._wantsHashChange) {
       this._checkUrlInterval = setInterval(this._checkUrlCallback, this.interval);
@@ -198,7 +188,7 @@ var BrowserHistory = (function (History) {
     } else if (this._wantsHashChange) {
       updateHash(this.location, fragment, options.replace);
 
-      if (this.iframe && (fragment !== this.getFragment(this.getHash(this.iframe)))) {
+      if (this.iframe && fragment !== this.getFragment(this.getHash(this.iframe))) {
         if (!options.replace) {
           this.iframe.document.open().close();
         }
@@ -221,6 +211,11 @@ var BrowserHistory = (function (History) {
   };
 
   return BrowserHistory;
-})(History);
+})();
+
+function install(aurelia) {
+  aurelia.withSingleton(History, BrowserHistory);
+}
 
-exports.BrowserHistory = BrowserHistory;
+exports.BrowserHistory = BrowserHistory;
+exports.install = install;
diff --git a/dist/es6/index.js b/dist/es6/index.js
@@ -24,23 +24,7 @@ function updateHash(location, fragment, replace) {
   }
 }
 
-function extend(obj) {
-  var rest = Array.prototype.slice.call(arguments, 1);
-
-  for (var i = 0, length = rest.length; i < length; i++) {
-    var source = rest[i];
-
-    if (source) {
-      for (var prop in source) {
-        obj[prop] = source[prop];
-      }
-    }
-  }
-
-  return obj;
-}
-
-export class BrowserHistory extends History {
+class BrowserHistory extends History {
   constructor(){
     this.interval = 50;
     this.active = false;
@@ -59,10 +43,12 @@ export class BrowserHistory extends History {
   }
 
   getFragment(fragment, forcePushState) {
+    var root;
+
     if (!fragment) {
       if (this._hasPushState || !this._wantsHashChange || forcePushState) {
         fragment = this.location.pathname + this.location.search;
-        var root = this.root.replace(trailingSlash, '');
+        root = this.root.replace(trailingSlash, '');
         if (!fragment.indexOf(root)) {
           fragment = fragment.substr(root.length);
         }
@@ -83,7 +69,7 @@ export class BrowserHistory extends History {
 
     // Figure out the initial configuration. Do we need an iframe?
     // Is pushState desired ... is it available?
-    this.options = extend({}, { root: '/' }, this.options, options);
+    this.options = Object.assign({}, { root: '/' }, this.options, options);
     this.root = this.options.root;
     this._wantsHashChange = this.options.hashChange !== false;
     this._wantsPushState = !!this.options.pushState;
@@ -238,4 +224,13 @@ export class BrowserHistory extends History {
   navigateBack() {
     this.history.back();
   }
-}
+}
+
+function install(aurelia){
+  aurelia.withSingleton(History, BrowserHistory);
+}
+
+export {
+  BrowserHistory,
+  install
+};