reshow
Advanced tools
Comparing version 0.0.9 to 0.0.10
@@ -27,4 +27,2 @@ 'use strict'; | ||
var PageState = _immutable2.default.Map(); | ||
var PageStore = function (_ReduceStore) { | ||
@@ -42,3 +40,3 @@ _inherits(PageStore, _ReduceStore); | ||
value: function getInitialState() { | ||
return PageState; | ||
return _immutable2.default.Map(); | ||
} | ||
@@ -45,0 +43,0 @@ }, { |
@@ -15,6 +15,10 @@ 'use strict'; | ||
var _utils = require('flux/utils'); | ||
var _reshow = require('../organisms/reshow'); | ||
var _utils = require('flux/utils'); | ||
var _pageStore = require('../../src/stores/pageStore'); | ||
var _pageStore2 = _interopRequireDefault(_pageStore); | ||
function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; } | ||
@@ -43,3 +47,4 @@ | ||
} | ||
var params = url.split('/'); | ||
var separator = -1 !== url.indexOf('#') ? '#' : '/'; | ||
var params = url.split(separator); | ||
var last = params.length - 1; | ||
@@ -55,8 +60,2 @@ if (params[last]) { | ||
}, { | ||
key: 'updateWithUrl', | ||
value: function updateWithUrl(props) { | ||
var parseUrl = props.parseUrl ? props.parseUrl : this.parseUrl; | ||
this.update(_extends({}, props, parseUrl(props.url))); | ||
} | ||
}, { | ||
key: 'componentDidMount', | ||
@@ -66,6 +65,16 @@ value: function componentDidMount() { | ||
var props = this.props; | ||
self.updateWithUrl.bind(self); | ||
self.updateWithUrl(props); | ||
var updateWithUrl = function updateWithUrl(url) { | ||
var state = _pageStore2.default.getState(); | ||
var parseUrl = state.parseUrl ? state.parseUrl : self.parseUrl; | ||
var configs = _extends({ parseUrl: parseUrl }, parseUrl(url)); | ||
self.update(configs); | ||
}; | ||
setTimeout(function () { | ||
self.setState({ | ||
updateWithUrl: updateWithUrl | ||
}); | ||
updateWithUrl(props.url); | ||
}); | ||
window.onpopstate = function (e) { | ||
self.updateWithUrl(props); | ||
updateWithUrl(props.url); | ||
}; | ||
@@ -72,0 +81,0 @@ } |
@@ -77,2 +77,3 @@ 'use strict'; | ||
baseUrl: props.baseUrl, | ||
updateWithUrl: state.updateWithUrl, | ||
ajax: props.ajax, | ||
@@ -79,0 +80,0 @@ callback: function callback(json) { |
{ | ||
"name": "reshow", | ||
"version": "0.0.9", | ||
"version": "0.0.10", | ||
"description": "Flux Reducer Present Library", | ||
@@ -16,3 +16,3 @@ "main": "./build/src/index.js", | ||
"immutable": "^3.7.4", | ||
"organism-react-ajax": "^0.0.3" | ||
"organism-react-ajax": "^0.0.4" | ||
}, | ||
@@ -19,0 +19,0 @@ "devDependencies": { |
18130
313
+ Addedorganism-react-ajax@0.0.4(transitive)
- Removedorganism-react-ajax@0.0.3(transitive)
Updatedorganism-react-ajax@^0.0.4