Skip to content

Commit

Permalink
Fix eslint errors (#1521)
Browse files Browse the repository at this point in the history
  • Loading branch information
Swordsman-Inaction authored and aksonov committed Jan 9, 2017
1 parent f8134f9 commit 0439adb
Showing 1 changed file with 12 additions and 11 deletions.
23 changes: 12 additions & 11 deletions src/Reducer.js
Original file line number Diff line number Diff line change
Expand Up @@ -178,17 +178,18 @@ function inject(state, action, props, scenes) {
return { ...state, children: state.children };
}
case ActionConst.REFRESH:
return props.base ?
{ navBar: state.navBar,
...scenes.rootProps,
...props,
key: state.key,
from: null }
: { ...state,
...props,
key: state.key,
from: null,
};
return props.base ? {
navBar: state.navBar,
...scenes.rootProps,
...props,
key: state.key,
from: null }
: {
...state,
...props,
key: state.key,
from: null,
};
case ActionConst.PUSH_OR_POP:
ind = state.children.findIndex(el => el.sceneKey === action.key);
if (ind !== -1) {
Expand Down

0 comments on commit 0439adb

Please sign in to comment.