uhhm/buuh
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Save location (#534)

Browse Source 
* add location

* remove zopfli from build

* state.location -> state.href

* add state.href docs
This commit is contained in:
Yoshua Wuyts
2017-07-26 19:31:15 +02:00
committed by GitHub
parent 4684f5ef1a
commit 9c8c5b3c85
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
index.js
+7 -5
View File
@@ -122,16 +122,17 @@ Choo.prototype.start = function () {
}
}
var location = this._createLocation()
this._tree = this.router(location)
this.state.href = this._createLocation()
this._tree = this.router(this.state.href)
this.state.query = nanoquery(window.location.search)
assert.ok(this._tree, 'choo.start: no valid DOM node returned for location ' + location)
assert.ok(this._tree, 'choo.start: no valid DOM node returned for location ' + this.state.href)
this.emitter.prependListener(self._events.RENDER, nanoraf(function () {
var renderTiming = nanotiming('choo.render')
var newTree = self.router(self._createLocation())
assert.ok(newTree, 'choo.render: no valid DOM node returned for location ' + location)
self.state.href = self._createLocation()
var newTree = self.router(self.state.href)
assert.ok(newTree, 'choo.render: no valid DOM node returned for location ' + self.state.href)
assert.equal(self._tree.nodeName, newTree.nodeName, 'choo.render: The target node <' +
self._tree.nodeName.toLowerCase() + '> is not the same type as the new node <' +
@@ -182,6 +183,7 @@ Choo.prototype.toString = function (location, state) {
assert.equal(typeof location, 'string', 'choo.toString: location should be type string')
assert.equal(typeof this.state, 'object', 'choo.toString: state should be type object')
this.state.href = location.replace(/\?*.$/, '')
this.state.query = nanoquery(location)
var html = this.router(location)
assert.ok(html, 'choo.toString: no valid value returned for the route ' + location)