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

Слияние 2 веток и исправление багов. #36

Merged
merged 23 commits into from
Jun 12, 2016

Conversation

khaydarov
Copy link
Member

@khaydarov khaydarov commented Jun 11, 2016

Смерджил все изменения. Исправил баг с кареткой. При нажатии enter когда тулбар открыт, срабатывает функция toolbarClicked.

closes #28


var focusedTextNode = '';

if (focusedNodeHolder.childNodes){
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

две одинаковые проверки.


newBlock.contentEditable = "true";
newBlock.classList.add(cEditor.ui.BLOCK_CLASSNAME);
if ( currentNode.length === cEditor.caret.offset
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

тут нужен комментарий, сложно сходу понять что проверяется

@neSpecc neSpecc merged commit 93328b1 into master Jun 12, 2016
@neSpecc neSpecc deleted the transition branch June 12, 2016 22:29
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.

Убрать общий content editable элемент #95
2 participants