Commit graph

164 commits

Author SHA1 Message Date
George Berezhnoy 81886fc563 Twitch fix (#135)
* fix

* Update embed.css

* upd version from master
2017-01-28 17:59:57 +03:00
khaydarov 8eb549aa35 pasted text/plain or text/html (#134) 2017-01-28 17:14:36 +03:00
Peter Savchenko 0c55a995b4 plus button showing, embed.js paddings removed (#133) 2017-01-28 17:11:03 +03:00
khaydarov 30af67f3cf remove unused variables (#127) 2017-01-27 21:19:22 +03:00
khaydarov d1a04fc454 image module hotfix (#126)
* image module hotfix

* image improved configurations

* Image plugin updated

- add border settings
- show selected settings
- stretched setting
2017-01-27 21:10:04 +03:00
khaydarov cefa27971e update redactor version. New bundle 2017-01-26 21:12:17 +03:00
George Berezhnoy 1269a84f95 Merge remote-tracking branch 'refs/remotes/origin/master' into youtube-plugin-added 2017-01-26 03:47:19 +03:00
khaydarov 5c95baed54 added plugin configuration (#120) 2017-01-26 02:40:39 +03:00
khaydarov bbda0fb3ad header module (#119) 2017-01-26 01:41:18 +03:00
khaydarov cd58297a9e resolve 2017-01-25 19:59:39 +03:00
khaydarov b4663c0100 new bundle 2017-01-25 19:59:17 +03:00
khaydarov dae94e11e3 linebreak configurations (#115) 2017-01-25 19:32:14 +03:00
khaydarov 6a63c76b15 translated core placeholders to russian (#114) 2017-01-24 19:46:59 +03:00
George Berezhnoy f5b9bb7fe6 Small fix 2017-01-23 22:13:21 +03:00
khaydarov 8e6cf4eb6f fixed bug when enter pressed (#112)
When enter was pressed on empty node or node that has siblings,
function worked incorrect and created a new block
2017-01-20 21:25:28 +03:00
khaydarov a9a0992217 new feature (#109)
* new feature

method validate must be appended to codex.tools.

* beta-redactor

* before merge

* validate is not important setting
2017-01-18 18:12:50 +03:00
khaydarov 7af56b4149 Sanitizer and paste listener (#110)
* initial commit

* blockPasteCallback improved with caret restoring
2017-01-18 18:06:36 +03:00
George Berezhnoy d3e9b57324 Webpack re-build 2017-01-12 21:31:18 +03:00
George Berezhnoy 089c8b59de Paste tool remake and more video-services added 2017-01-12 16:56:06 +03:00
khaydarov 7ef493825c feature (#108) 2017-01-11 21:29:04 +03:00
khaydarov 83dbad9299 new setting for plugins. (#107) 2017-01-11 21:19:00 +03:00
George Berezhnoy a4bc52af04 Styles and names refactoring 2017-01-11 14:00:50 +03:00
khaydarov 0ed3e221cf update from master 2017-01-10 21:25:22 +03:00
khaydarov c3ee7560f1 cover restoring, versioning, sanitize and new initialization structure (#105)
* cover restoring fixed

* upd

* fetch fixed in safari

* updated

* plugins

* plugins ready

* code improved

* fixed bug with backspace

* improved architecture

* Versioning (#102)

* start versioning

* codex.version

* eslint settings

* versioning improved

* cover restoring and fetch function fixed (#101)

* cover restoring fixed

* upd

* fetch fixed in safari

* updated

* plugins

* plugins ready

* code improved

* fixed bug with backspace

* improved architecture

* new sanitize method (#103)

* new sanitize method

Need to fix caret position

* removed console logs

* version updated

* eslint style

* caret position

* big fixed on sanitize method

* sanitize improved, using observers

* sanitize: using html-janitor

* fixes

* last fixes, code improved after review

* updated

* new bundle

* webpack config improved

* upd

* upd

* upd

* upd

* clear from conflicts

* upd

* upd
2017-01-10 21:22:40 +03:00
khaydarov dee4d856fa plugin improved 2017-01-10 20:14:29 +03:00
khaydarov fbbccaa350 updated youtube plugin 2017-01-10 20:12:32 +03:00
khaydarov bc8fb1aed9 cover restoring and fetch function fixed (#101)
* cover restoring fixed

* upd

* fetch fixed in safari

* updated

* plugins

* plugins ready

* code improved

* fixed bug with backspace

* improved architecture
2016-12-25 17:41:57 +03:00
khaydarov b76ec5c0a1 toolbox leaf (#96)
* toolbox leaf

* new bundle

* bundle updates

* code improved

* updated
2016-12-18 16:54:34 +03:00
khaydarov 458c834dc9 new redactor version (#94)
* new redactor version

* update

* update

* bundler config updated

* clear bundler without plugins
2016-12-07 21:25:31 +03:00
khaydarov 339e15e349 updated from main website (#89) 2016-08-06 16:49:44 +03:00
khaydarov b0d3907793 changed parsing method. Now data parses data like sample.json (#84)
* changed parsing method. Now data parses data like sample.json

* saver module (#86)
2016-07-15 18:29:54 +03:00
khaydarov f5c8dc82e3 fixed bug — enterkey pressed on toolbar. (#83) 2016-07-15 14:43:30 +03:00
khaydarov 983d751b90 send errors when something wrong (#76)
* send errors when something wrong

* upgrade notifications module

* re-designed error notifications

* error appending
2016-07-14 20:50:43 +03:00
khaydarov 04a2c05c11 fixed caret transition to empty list content
 and pasting (#75)
* server-tool-link fixed bug

* fixed caret transition to empty list content

Fixed bug with list, URL path and block pasting. Now «paste» event
inserts from buffer to the first contenteditable element

* pasting to the block from Buffer in selected contenteditable element
2016-07-14 16:09:09 +03:00
khaydarov 4bbaf7de7b resolved comments. Renamed function getAllInputs to saveInputs. Leaved comments to some moments 2016-07-13 20:49:19 +03:00
khaydarov aa383f5a72 getAllInputs refactored 2016-07-13 20:16:01 +03:00
khaydarov 9425e17598 new modifications
1) improved blocks transmition. We can switch contenteditable elements
by clicking arrow buttons.

2) Refactoring (Removing) blocks. When backspace key pressed and input
is empty, we can remove from DOM this element
2016-07-13 20:08:53 +03:00
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
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