khaydarov
34eb871bb0
Merge branch 'master' of https://github.com/codex-team/codex.editor
2016-06-24 21:40:51 +03:00
Menshikov Alexander
1ba65106d8
Merge pull request #52 from codex-team/renderer-and-saver
...
new renderer and saver modules
2016-06-24 21:39:42 +03:00
khaydarov
2167d85d65
Merge branch 'master' of https://github.com/codex-team/codex.editor
2016-06-24 21:39:02 +03:00
khaydarov
306363a20e
upd
2016-06-24 21:38:49 +03:00
khaydarov
97afe46662
merged 2 requests
2016-06-24 21:36:25 +03:00
Peter Savchenko
f7728215b4
new renderer and saver modules
2016-06-24 21:30:54 +03:00
Peter Savchenko
edae598a54
input HTML -> input JSON ( #51 )
2016-06-24 22:10:59 +04:00
khaydarov
b582654c13
headers ( #50 )
...
* headers
* fixed
2016-06-24 22:09:56 +04:00
khaydarov
0bbc2c0b3f
headers
2016-06-24 20:41:41 +03:00
Peter Savchenko
0ce6987c1d
plugin example with settings ( #45 )
...
* plugin example with settings
* improve comments
2016-06-24 19:36:39 +04:00
Menshikov Alexander
e928701a1f
Merge pull request #42 from codex-team/sanitize_#29
...
Add sanitize for paste into block event.
2016-06-19 11:37:47 +03:00
Alex Alex
a1841f51e6
Fix tab to spaces
2016-06-18 21:14:36 +03:00
Alex Alex
42eec32890
Merge branch 'master' into sanitize_#29
2016-06-18 21:11:14 +03:00
neSpecc
b8029e8aca
Revert "Revert "Revert "Revert "block settings engine""""
...
This reverts commit 15943ec27b
.
2016-06-18 13:56:39 +03:00
neSpecc
15943ec27b
Revert "Revert "Revert "block settings engine"""
...
This reverts commit 3ca899ae79
.
2016-06-17 21:43:30 +03:00
neSpecc
3ca899ae79
Revert "Revert "block settings engine""
...
This reverts commit 77ae8beae8
.
2016-06-17 21:42:38 +03:00
neSpecc
77ae8beae8
Revert "block settings engine"
...
This reverts commit 8cdb1e329d
.
2016-06-17 21:41:54 +03:00
neSpecc
8cdb1e329d
block settings engine
...
Заложил основу настроек блока: верстка, отображение
2016-06-17 21:41:36 +03:00
Alexander Menshikov
0fc790e300
Add var
for nodeContent
...
Remove stopPropagation from sanitize callback
2016-06-17 20:11:06 +03:00
Alexander Menshikov
f455e806b3
Add sanitize for paste into block event. Currently pastes only into the end of a block.
2016-06-17 20:07:32 +03:00
khaydarov
93328b1879
Слияние 2 веток и исправление багов. ( #36 )
...
* done
* add event listener to UP and DOWN arrows
* upd arrow eventlistener. Switching blocks by UP, DOWN, LEFT and RIGHT buttons
* comments added
* fixed
* block handler
* caret module
* bug
* arrows keydows handlers
Продолжить дебажить изменения каретки
* upd
* add blockHandlers to promise
* fixed bugs
* upd
* ce_block to constant
* upd
* fixed bugs
* fixed
* upd
* comments updated
* upd
* comments updated
2016-06-13 02:29:50 +04:00
Peter Savchenko
fbd4f7d431
new tools scheme ( #35 )
2016-06-10 23:15:24 +04:00
Menshikov Alexander
e0d14e932f
Blocks ( #34 )
...
* Add new block by enter press
Delete current empty block by backspace press
* Fix bug with DeepestNode on empty block
* Fix comments in issues
* Remove console.log
* Fix global var issue
2016-06-10 23:08:09 +04:00
khaydarov
7fa2110dab
Переход курсора на следующий и предыдущий блоки при нажатии на кнопки вверх/вниз ( #32 )
...
* done
* add event listener to UP and DOWN arrows
* upd arrow eventlistener. Switching blocks by UP, DOWN, LEFT and RIGHT buttons
* comments added
* fixed
* block handler
* caret module
* bug
* arrows keydows handlers
Продолжить дебажить изменения каретки
* upd
* add blockHandlers to promise
* fixed bugs
* upd
* ce_block to constant
* upd
2016-06-10 19:57:02 +04:00
khaydarov
9444cbd80a
several contenteditables instead of one. Saving caret position
2016-06-04 20:45:49 +03:00
khaydarov
6d3cd4ebfd
Merge branch 'blocks'
2016-06-04 20:34:43 +03:00
khaydarov
b70d4f213e
Merge branch 'master' into blocks
2016-06-04 20:33:58 +03:00
khaydarov
d5ac08bd23
Caret position fixed
2016-06-04 20:32:29 +03:00
khaydarov
52ff467ae9
Merge branch 'test'
2016-06-04 20:29:29 +03:00
khaydarov
29334e034a
caret ready
2016-06-04 20:29:27 +03:00
khaydarov
ac36b80a83
Merge remote-tracking branch 'origin/master'
...
# Conflicts:
# codex-editor.js
2016-06-04 20:28:49 +03:00
khaydarov
b0c8dd11d5
Merge branch 'test'
2016-06-04 20:25:22 +03:00
khaydarov
2e5c571f88
saving caret position
2016-06-04 20:25:03 +03:00
neSpecc
f785bb9f7d
all blocks now contenteditable
2016-06-04 12:33:09 +03:00
khaydarov
6d2037777b
Caret ( #24 )
...
* toolbar position fixed
* ready
* upd
* current Node
* added SetCaret method which sets Caret in position before toolbar event executes
* fixed caret bugs
* upd
* caret position after first-level block modification fixed
* add comments to variables
* fixed comparing method for nodes
* setCaret and saveCaretPosition updated
* fixed var description
* upd
* done
2016-05-25 22:08:41 +04:00
khaydarov
a2493372f6
done
2016-05-25 20:54:13 +03:00
khaydarov
bf9052bba4
upd
2016-05-25 20:52:01 +03:00
khaydarov
4d352c8db1
fixed var description
2016-05-25 20:06:05 +03:00
khaydarov
0feddee213
setCaret and saveCaretPosition updated
2016-05-25 20:01:54 +03:00
khaydarov
45b1a59ef4
fixed comparing method for nodes
2016-05-25 19:40:46 +03:00
khaydarov
6b680f85ac
add comments to variables
2016-05-25 18:47:10 +03:00
khaydarov
ab00d85b54
caret position after first-level block modification fixed
2016-05-25 18:27:23 +03:00
khaydarov
b160523323
upd
2016-05-19 19:09:29 +03:00
khaydarov
cbe84ccf7d
fixed caret bugs
2016-05-19 18:21:26 +03:00
khaydarov
0f85b814df
added SetCaret method which sets Caret in position before toolbar event executes
2016-05-18 19:42:22 +03:00
khaydarov
d5540b7834
Merge branch 'master' of https://github.com/codex-team/codex.editor
...
merging
2016-05-12 21:32:32 +03:00
khaydarov
abcc69d14d
current Node
2016-05-12 21:32:26 +03:00
neSpecc
e132c823fb
move toolbar-button click handler to separated callback
2016-05-12 14:02:09 +03:00
khaydarov
1984feff8f
toolbar position fixed ( #22 )
...
* toolbar position fixed
* ready
* upd
2016-05-11 19:02:10 +04:00
khaydarov
fb10222004
upd
2016-05-11 17:21:32 +03:00