Fixes #1631#1632
Merged
taylortom merged 8 commits intoadaptlearning:developfrom Aug 24, 2017
Merged
Conversation
* Fix component layout options * Fix component layout options * Fix component layout options * Check remaining available positions in block as well as _supportedLayout
Pass a supportedLayout object to the showDropZones method defined in the editorOriginView so that only the appropriate drop zones are displayed when dragging a component from one block to another.
brian-learningpool
approved these changes
May 15, 2017
barry-mckay
approved these changes
May 16, 2017
Contributor
|
This is currently going to the master branch, should it not be going to develop? |
Member
|
Thanks @danielstorey, we'll roll this into the next release :) |
dancgray
approved these changes
Jul 31, 2017
* develop: (296 commits) revert image changes Refactor nesting Localise page title, remove initialize function from models rebase and fix conflicts plus broken stuff localise body text Add block layout options Populate new courses so that they can be previewed Remove test_frontend/ Remove grunt-casperjs from dependencies fix auth source issue Bump timeout for Travis Fix asset preview in place Remove test data both before and after tests Add extended timeout to after() in addition to before() Reinstate longer timeout Add grunt to deps Temporarily disable casperjs tests Update package.json prior for next release Update mocha Tidy up mocha config ... # Conflicts: # frontend/src/modules/editor/contentObject/views/editorPageComponentListView.js # frontend/src/modules/editor/contentObject/views/editorPageComponentView.js # frontend/src/modules/editor/global/views/editorOriginView.js
Fix conflicts with refactored develop
| }).$el); | ||
| this.$('.editor-component-list-sidebar-list').append(new EditorComponentListItemView({ | ||
| model: componentType, | ||
| availablePositions: availablePositions, |
Contributor
There was a problem hiding this comment.
availablePositions could now potentionally be undefined. Suggest line 87 is moved out to sit above the if statement.
tomgreenfield
requested changes
Aug 24, 2017
| parentView: this.parentView, | ||
| searchTerms: componentType.get('displayName').toLowerCase() | ||
| }).$el); | ||
| this.$('.editor-component-list-sidebar-list').append(new EditorComponentListItemView({ |
Contributor
There was a problem hiding this comment.
Getting an error when I try to add a component. I don't think the view should have been renamed here?
tomgreenfield
approved these changes
Aug 24, 2017
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
8 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Ensure only the supported drop zones are displayed when dragging a component from one block to another.