Commit graph

126 commits

Author SHA1 Message Date
George Berezhnoy
5abe5d55cb Merge remote-tracking branch 'refs/remotes/origin/master' into comments
# Conflicts:
#	codex-editor.js
#	codex-editor.js.map
#	codex.js
#	modules/draw.js
#	modules/ui.js
#	whatwg-fetch.js
#	whatwg-fetch.js.map
2017-02-02 13:36:00 +03:00
George Berezhnoy
b6b8155ce8 Comments for block added 2017-02-02 02:37:47 +03:00
Peter Savchenko
e71a12401a Refactoring (#144)
* codex -> codex.editor

* ESlint code style

* Code lint

* fix inline module 'this' call

* fixed toolbox leaf

* removed empty spaces

* caret module code improved
2017-02-01 20:25:59 +03:00
Peter Savchenko
70df6b20b0 New plugin preparation scheme - now async (#143)
- core.importScript now returns a Promise
- ui.preparePlugins now returns a Promise
- `prepare` method of tools now *should* return a promise
2017-02-01 12:14:00 +03:00
khaydarov
ab66bb9ca5 new bundle v1.3.11 2017-01-30 20:29:26 +03:00
khaydarov
4811d44848 conflics resolved 2017-01-30 20:28:07 +03:00
khaydarov
c5140d1085 comments to function 2017-01-30 20:20:29 +03:00
khaydarov
87b20c0686 APi method renamed 2017-01-30 20:14:01 +03:00
khaydarov
869c65f3da code improved after review 2017-01-30 20:11:58 +03:00
khaydarov
bb7aaee8e3 Merge branch 'master' into paragraph-parser-algorythm
# Conflicts:
#	codex-editor.js.map
#	whatwg-fetch.js.map
2017-01-30 19:57:52 +03:00
khaydarov
119f7b7ec7 new method for paragraph parser
made new method that parses content
UL won’t we passed from sanitize
2017-01-30 19:56:52 +03:00
Peter Savchenko
1cf1c3bbca increment version to 1.3.10 2017-01-30 18:12:50 +03:00
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