Skip to content

Handle paste card at start of middle list item #468

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
bantic merged 1 commit into from
Aug 24, 2016
Merged

Handle paste card at start of middle list item #468

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
45 changes: 19 additions & 26 deletions src/js/editor/post.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -875,33 +875,26 @@ class PostEditor {
position = pre.tailPosition();
}

let positionIsStart = position.isEqual(list.headPosition()),
positionIsEnd = position.isEqual(list.tailPosition());

if (positionIsStart || positionIsEnd) {
let blank = this.builder.createListSection(list.tagName);
let reference = position.isEqual(list.headPosition()) ? list :
list.next;
let collection = this.editor.post.sections;
this.insertSectionBefore(collection, blank, reference);

let lists = positionIsStart ? [blank, list] : [list, blank];
return lists;
} else {
let preList = this.builder.createListSection(list.tagName),
postList = this.builder.createListSection(list.tagName);
let preItem = position.section;
let currentList = preList;
list.items.forEach(item => {
currentList.items.append(item.clone());
if (item === preItem) {
currentList = postList;
}
});
let preList = this.builder.createListSection(list.tagName);
let postList = this.builder.createListSection(list.tagName);

let preItem = position.section;
let currentList = preList;
list.items.forEach(item => {
// If this item matches the start item and the position is at its start,
// it should be appended to the postList instead of the preList
if (item === preItem && position.isEqual(item.headPosition())) {
currentList = postList;
}
currentList.items.append(item.clone());
// If we just appended the preItem, append the remaining items to the postList
if (item === preItem) {
currentList = postList;
}
});

this._replaceSection(list, [preList, postList]);
return [preList, postList];
}
this._replaceSection(list, [preList, postList]);
return [preList, postList];
}

/**
Expand Down
2 changes: 2 additions & 0 deletions tests/unit/editor/post/insert-post-test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,8 @@ let expectationGroups = [{
[['* abc|','* def'], ['[my-card]'], ['* abc','[my-card]|','* def']],
[['* ab|c','* def'], ['[my-card]'], ['* ab','[my-card]|','* c','* def']],
[['* abc|','* def'], ['[my-card]'], ['* abc','[my-card]|','* def']],
// See https://github.com/bustlelabs/mobiledoc-kit/issues/467
[['* abc','* |def'], ['[my-card]'], ['* abc','[my-card]|','* def']],

// insert markup section between list items
[['* abc|','* def'], ['123'], ['* abc123|','* def']],
Expand Down