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.

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

Fix part of #1464: implement the collection editor node list #1993

Merged
merged 38 commits into from
Jun 5, 2016

Conversation

BenHenning
Copy link
Member

This PR is replacing #1687 by moving it to a staged feature branch.

Abraham Mgowano and others added 30 commits February 15, 2016 22:07
Abraham Mgowano and others added 6 commits June 4, 2016 13:35
Fix part of #1464: implement the collection editor node list (PR 1/2; this is to bring Abe's changes into the central Oppia respository)
…-list

Conflicts:
	core/templates/dev/head/collection_editor/editor_tab/CollectionNodeCreatorDirective.js
	core/templates/dev/head/collection_editor/editor_tab/collection_details_editor_directive.html
	core/templates/dev/head/collection_editor/editor_tab/collection_main_tab_directive.html
into a single source: CollectionLinearizerService. This service helps
with inserting and deleting nodes. It also led to simpler validation
logic and a much simpler filter for the collection node viewer. Tests
still need to be added for this new service.
@BenHenning
Copy link
Member Author

Merging this into the staging branch without review. FYI: This now includes the shifting nodes left/right functionality. #1998 has been filed to track the remaining work needed from this PR that's not already covered in #1464 (namely implementing tests for the new service).

@BenHenning BenHenning merged commit 37ae3a4 into collection-editor-first-iteration Jun 5, 2016
@BenHenning BenHenning deleted the collection-node-list branch June 5, 2016 08:51
joshuacano pushed a commit to joshuacano/oppia that referenced this pull request Jun 14, 2016
…pia#1993)

Provides a base implementation for the collection editor node list without dragging being used for scrolling.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants