Skip to content

Feature(multiple pop): now we can pop multipe scenes with Actions.pop #806

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 15, 2016
Merged

Feature(multiple pop): now we can pop multipe scenes with Actions.pop #806

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d45f71e
Feature(multiple pop): now we can pop multipe scenes with Actions.pop…
Swordsman-Inaction Jun 10, 2016
51429c2
Fix(format)
Swordsman-Inaction Jun 10, 2016
278e398
Fix(data check, format): compare data with index, add semicolon
Swordsman-Inaction Jun 10, 2016
515064a
Fix(change data to popNum)
Swordsman-Inaction Jun 14, 2016
92e3476
-Fix(format)
Swordsman-Inaction Jun 14, 2016
67e3ce9
Fix(format)
Swordsman-Inaction Jun 14, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Fix(data check, format): compare data with index, add semicolon
  • Loading branch information
@Swordsman-Inaction
Swordsman-Inaction committed Jun 10, 2016
commit 278e398a99c755099a92e970d0a350cad64ddd4c
19 changes: 10 additions & 9 deletions src/Reducer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,16 +64,17 @@ function inject(state, action, props, scenes) {
return state;
}

let popNum = 1
let popNum = 1;
if (action.data) {
assert(typeof(action.data) === 'number', 'The data is the number of scenes you want to pop, it must be Number')
popNum = action.data
assert(popNum % 1 === 0,
'The data is the number of scenes you want to pop, it must be integer.')
assert(popNum > 1,
'The data is the number of scenes you want to pop, it must be bigger than 1.')
assert(popNum < state.children.length,
"The data is the number of scenes you want to pop, it must be smaller than scenes stack's length.")
assert(typeof(action.data) === 'number',
'The data is the number of scenes you want to pop, it must be Number');
popNum = action.data;
assert(popNum % 1 === 0,
'The data is the number of scenes you want to pop, it must be integer.');
assert(popNum > 1,
'The data is the number of scenes you want to pop, it must be bigger than 1.');
assert(popNum <= state.index,
"The data is the number of scenes you want to pop, it must be smaller than scenes stack's length.");
}

return {
Expand Down