Menshikov Alexander
120ae9793d
Merge pull request #68 from codex-team/transport
...
transport begin
2016-07-02 20:19:01 +03:00
Peter Savchenko
0d3423724c
transport begin
2016-07-02 20:16:22 +03:00
Menshikov Alexander
0626ca1f07
Tool code ( #67 )
...
* Add error background
* Add tool code
Fix switch block and insert block for new system with div wrappers
* Remove unneccessary appendChild
* Fix css in tool code
2016-07-02 19:18:38 +03:00
khaydarov
2f2f508659
merged
2016-07-02 18:37:10 +03:00
Peter Savchenko
b25ba148cc
arrow up and left buttons callback update
2016-07-02 17:36:46 +03:00
khaydarov
6b69d1f325
Merge branch 'master' into quotes
...
# Conflicts:
# example.html
2016-07-02 15:30:08 +03:00
Peter Savchenko
a6a1fec6d8
each blocks now wraps with DIV ( #65 )
...
- down arrow handler improved
- image plugin started
2016-07-02 15:28:36 +03:00
khaydarov
19e8fd1e40
first prototype of quote plugin is ready
2016-07-02 14:03:08 +03:00
khaydarov
63cc5ac927
quotes plugin prototype
2016-07-02 13:53:57 +03:00
khaydarov
006ffc1b59
need refactoring
2016-07-02 10:56:49 +03:00
Peter Savchenko
8a910cdabf
fix block order bug
2016-07-02 10:34:18 +03:00
Menshikov Alexander
b72593041e
Tool link plugin ( #58 )
...
* Finish core functionality of the tool link
* Some css beauty
* Fix css border: 0
* Change to className.add()
* Remove 'to' in comments
* Use this where it is real
Remove default type setting in Input
* Code refactoring
* Implement save() method
* Optimise variable usage
* Add UI maker
* Clearfix
Objects clone
Css in tool-link plugin
* Fix
* Fix CSS
2016-07-01 21:34:29 +03:00
khaydarov
e7a86559d2
Merge branch 'master' into quotes
2016-07-01 21:03:48 +03:00
khaydarov
659ceb8b69
fixed
2016-07-01 21:03:44 +03:00
Peter Savchenko
f7e4d3393c
append -> make()
2016-07-01 21:02:49 +03:00
khaydarov
db6ad166a7
Merge branch 'master' into quotes
2016-07-01 19:55:10 +03:00
khaydarov
78d3bdf28c
quotes#1
2016-07-01 19:54:57 +03:00
Peter Savchenko
cb7f92e0a3
fix copying element on insert bug
2016-07-01 18:52:38 +03:00
khaydarov
53a23f02a9
upd quotes
2016-06-30 22:01:36 +03:00
Peter Savchenko
30f5ba0cf7
Revert "quote plugin - begiing"
...
This reverts commit ad1b4fd849 .
2016-06-29 21:50:10 +03:00
khaydarov
ad1b4fd849
quote plugin - begiing
2016-06-29 21:46:43 +03:00
Peter Savchenko
3a96e94d5b
switches block P , QUOTE, HEADER ( #59 )
...
* switches block P , QUOTE, HEADER
* node cloning
2016-06-29 21:45:20 +03:00
khaydarov
9f95ded32a
quote plugin - begiing
2016-06-29 20:53:15 +03:00
Peter Savchenko
b93942a820
Renderer sequence, Render and Save example, ( #53 )
...
* Renderer sequence, Render and Save example,
* move render method close to the save
* fixed bugs and parapraph plugin added
* result JSON example
* upd
* upd
* cEditor tools cleared default methods
* upd
2016-06-29 18:54:20 +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
Peter Savchenko
0ce6987c1d
plugin example with settings ( #45 )
...
* plugin example with settings
* improve comments
2016-06-24 19:36:39 +04: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
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
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