Skip to content
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

Jump to bottom

Back button #42

Merged
merged 20 commits into from
Dec 14, 2017
Merged

Back button #42

merged 20 commits into from
Dec 14, 2017

Conversation

NQNStudios
Copy link
Collaborator

Addresses issue #36

Changes proposed by this pull request:

  • Core has a new function, GotoLastSection
  • Compiler injects every section div with a special link with data-call-function="Core.GotoLastSection"
    • Fixed a bug where some function links couldn't use . access
  • Core.ExpandSection can optionally strip the back button from its output. This is done when expanding inline sections.
  • The back button has infinite history, and returns the player to the previous section exactly as it was before it was left.
  • The back button calls the same OnGotoSection callback, which has been extended with another parameter specifying whether it was a normal link, or the back button, which triggered the move.

@invicticide to review

Nathaniel Nelson added 19 commits November 24, 2017 13:17
Starting to add prettify option
4edb1c8
Revert "Starting to add prettify option"
f8949bf 
This reverts commit 4edb1c8.
Merge branch 'dev' of https://github.com/invicticide/fractive into dev
92a3e4d
Merge branch 'dev' of http://github.com/invicticide/fractive into dev
9b01d74
Merge branch 'dev' of http://github.com/invicticide/fractive into dev
8c7b670
Merge branch 'dev' of github.com:NQNStudios/fractive into dev
8483ff3
Merge branch 'dev' of https://github.com/invicticide/fractive into dev
8e2b3f5
Merge branch 'dev' of https://github.com/invicticide/fractive into dev
c699e90
Building function to re-enable disabled links
ecff8d8
Finished implementing EnableLinks()
24a8132
Keep the history section organized by section divs
ffc97f0
Refactored recursive window access into a function, wrote GotoLastSec…
be0cac6 
…tion function
Basic example has a sample back button
e9c3fa9
Remove last section from history when going back
78478e2
Adding a goingBack parameter to the onGoToSection callback
867044f
Back button is added to all sections
8f425fd
Can strip back button from embedded sections
0f09e9e
Back button formats nicer now
6327a35
Fixed output location of basic example
c4dd817
@NQNStudios
Copy link
Collaborator Author

Possible improvement could be allowing custom placement of the back button in the html template, and only creating one link which is always present outside of the currentSection div. That way, the modification to ExpandSection would be rendered unnecessary.

@invicticide invicticide merged commit 86129a7 into invicticide:dev Dec 14, 2017
invicticide pushed a commit that referenced this pull request Dec 14, 2017
Manually merged PR #42: Back Button
e5d62bc 
- Resolved merge conflict in template header
- Renamed GotoLastSection -> GotoPreviousSection for clarity
- Floated back button to the left of the header in the basic example
- Minor tweaks and cleanup
@invicticide invicticide mentioned this pull request Dec 14, 2017
Closed
@NQNStudios NQNStudios deleted the back-button branch December 21, 2017 17:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@NQNStudios @invicticide