Merge branch 'master' into release.1.6

This commit is contained in:
Taly Guryn 2017-08-30 02:24:03 +03:00
commit f53f3b9149
5 changed files with 9 additions and 4 deletions

1
CODEOWNERS Normal file
View file

@ -0,0 +1 @@
* @neSpecc @gohabereg @khaydarov @talyguryn

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View file

@ -363,7 +363,11 @@ module.exports = (function (ui) {
*/
editor.listeners.add(block, 'paste', editor.paste.blockPasteCallback, false);
/**
* Show inline toolbar for selected text
*/
editor.listeners.add(block, 'mouseup', editor.toolbar.inline.show, false);
editor.listeners.add(block, 'keyup', editor.toolbar.inline.show, false);
};

View file

@ -1,6 +1,6 @@
{
"name": "codex.editor",
"version": "1.6.6",
"version": "1.6.7",
"description": "Codex Editor. Native JS, based on API and Open Source",
"main": "index.js",
"scripts": {