From 658206be620f12c7d8cc43b2b658e4490b9d282a Mon Sep 17 00:00:00 2001 From: Stefan Neculai Date: Mon, 28 Nov 2016 15:35:35 +0200 Subject: [PATCH] Change version to 2.4.0-rc1. --- css/froala_editor.css | 2 +- css/froala_editor.min.css | 2 +- css/froala_editor.pkgd.css | 2 +- css/froala_editor.pkgd.min.css | 2 +- css/froala_style.css | 2 +- css/froala_style.min.css | 2 +- css/plugins/char_counter.css | 2 +- css/plugins/char_counter.min.css | 2 +- css/plugins/code_view.css | 2 +- css/plugins/code_view.min.css | 2 +- css/plugins/colors.css | 2 +- css/plugins/colors.min.css | 2 +- css/plugins/draggable.css | 2 +- css/plugins/draggable.min.css | 2 +- css/plugins/emoticons.css | 2 +- css/plugins/emoticons.min.css | 2 +- css/plugins/file.css | 2 +- css/plugins/file.min.css | 2 +- css/plugins/fullscreen.css | 2 +- css/plugins/fullscreen.min.css | 2 +- css/plugins/help.css | 2 +- css/plugins/help.min.css | 2 +- css/plugins/image.css | 2 +- css/plugins/image.min.css | 2 +- css/plugins/image_manager.css | 2 +- css/plugins/image_manager.min.css | 2 +- css/plugins/line_breaker.css | 2 +- css/plugins/line_breaker.min.css | 2 +- css/plugins/quick_insert.css | 2 +- css/plugins/quick_insert.min.css | 2 +- css/plugins/table.css | 2 +- css/plugins/table.min.css | 2 +- css/plugins/video.css | 2 +- css/plugins/video.min.css | 2 +- css/themes/dark.css | 2 +- css/themes/dark.min.css | 2 +- css/themes/gray.css | 2 +- css/themes/gray.min.css | 2 +- css/themes/red.css | 2 +- css/themes/red.min.css | 2 +- css/themes/royal.css | 2 +- css/themes/royal.min.css | 2 +- js/froala_editor.min.js | 4 ++-- js/froala_editor.pkgd.min.js | 4 ++-- js/languages/ar.js | 2 +- js/languages/bs.js | 2 +- js/languages/cs.js | 2 +- js/languages/da.js | 2 +- js/languages/de.js | 2 +- js/languages/en_ca.js | 2 +- js/languages/en_gb.js | 2 +- js/languages/es.js | 2 +- js/languages/et.js | 2 +- js/languages/fa.js | 2 +- js/languages/fi.js | 2 +- js/languages/fr.js | 2 +- js/languages/he.js | 2 +- js/languages/hr.js | 2 +- js/languages/hu.js | 2 +- js/languages/id.js | 2 +- js/languages/it.js | 2 +- js/languages/ja.js | 2 +- js/languages/ko.js | 2 +- js/languages/me.js | 2 +- js/languages/nb.js | 2 +- js/languages/nl.js | 2 +- js/languages/pl.js | 2 +- js/languages/pt_br.js | 2 +- js/languages/pt_pt.js | 2 +- js/languages/ro.js | 2 +- js/languages/ru.js | 2 +- js/languages/sr.js | 2 +- js/languages/sv.js | 2 +- js/languages/th.js | 2 +- js/languages/tr.js | 2 +- js/languages/ua.js | 2 +- js/languages/vi.js | 2 +- js/languages/zh_cn.js | 2 +- js/languages/zh_tw.js | 2 +- js/plugins/align.min.js | 2 +- js/plugins/char_counter.min.js | 2 +- js/plugins/code_beautifier.min.js | 2 +- js/plugins/code_view.min.js | 2 +- js/plugins/colors.min.js | 2 +- js/plugins/draggable.min.js | 2 +- js/plugins/emoticons.min.js | 2 +- js/plugins/entities.min.js | 2 +- js/plugins/file.min.js | 2 +- js/plugins/font_family.min.js | 2 +- js/plugins/font_size.min.js | 2 +- js/plugins/forms.min.js | 2 +- js/plugins/fullscreen.min.js | 2 +- js/plugins/help.min.js | 2 +- js/plugins/image.min.js | 2 +- js/plugins/image_manager.min.js | 2 +- js/plugins/inline_style.min.js | 2 +- js/plugins/line_breaker.min.js | 2 +- js/plugins/link.min.js | 2 +- js/plugins/lists.min.js | 2 +- js/plugins/paragraph_format.min.js | 2 +- js/plugins/paragraph_style.min.js | 2 +- js/plugins/quick_insert.min.js | 2 +- js/plugins/quote.min.js | 2 +- js/plugins/save.min.js | 2 +- js/plugins/table.min.js | 2 +- js/plugins/url.min.js | 2 +- js/plugins/video.min.js | 2 +- 107 files changed, 109 insertions(+), 109 deletions(-) diff --git a/css/froala_editor.css b/css/froala_editor.css index 862b0b16b..fe3677928 100644 --- a/css/froala_editor.css +++ b/css/froala_editor.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/froala_editor.min.css b/css/froala_editor.min.css index 643877bf8..4644e4fdd 100644 --- a/css/froala_editor.min.css +++ b/css/froala_editor.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/froala_editor.pkgd.css b/css/froala_editor.pkgd.css index 25d05e3f8..5884faba8 100644 --- a/css/froala_editor.pkgd.css +++ b/css/froala_editor.pkgd.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/froala_editor.pkgd.min.css b/css/froala_editor.pkgd.min.css index d2917f7f0..8ad4343a7 100644 --- a/css/froala_editor.pkgd.min.css +++ b/css/froala_editor.pkgd.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/froala_style.css b/css/froala_style.css index 8d9a9e075..bd901c350 100644 --- a/css/froala_style.css +++ b/css/froala_style.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/froala_style.min.css b/css/froala_style.min.css index 848fc017e..55d6b4fc8 100644 --- a/css/froala_style.min.css +++ b/css/froala_style.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/char_counter.css b/css/plugins/char_counter.css index c3bfe2fc3..533c487b1 100644 --- a/css/plugins/char_counter.css +++ b/css/plugins/char_counter.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/char_counter.min.css b/css/plugins/char_counter.min.css index 22ed1267f..0abe1a348 100644 --- a/css/plugins/char_counter.min.css +++ b/css/plugins/char_counter.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/code_view.css b/css/plugins/code_view.css index 37908e125..d82484dbf 100644 --- a/css/plugins/code_view.css +++ b/css/plugins/code_view.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/code_view.min.css b/css/plugins/code_view.min.css index adca6b33b..64f05d015 100644 --- a/css/plugins/code_view.min.css +++ b/css/plugins/code_view.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/colors.css b/css/plugins/colors.css index 561650792..c20af17d2 100644 --- a/css/plugins/colors.css +++ b/css/plugins/colors.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/colors.min.css b/css/plugins/colors.min.css index f4af924f8..ef0940f71 100644 --- a/css/plugins/colors.min.css +++ b/css/plugins/colors.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/draggable.css b/css/plugins/draggable.css index 1d25c5e83..6129f3b64 100644 --- a/css/plugins/draggable.css +++ b/css/plugins/draggable.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/draggable.min.css b/css/plugins/draggable.min.css index 8039e0d3a..860864d8d 100644 --- a/css/plugins/draggable.min.css +++ b/css/plugins/draggable.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/emoticons.css b/css/plugins/emoticons.css index 1561db7ba..0a63924f1 100644 --- a/css/plugins/emoticons.css +++ b/css/plugins/emoticons.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/emoticons.min.css b/css/plugins/emoticons.min.css index 87d10e4c4..821706a4e 100644 --- a/css/plugins/emoticons.min.css +++ b/css/plugins/emoticons.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/file.css b/css/plugins/file.css index f842b6052..1f4cc8d66 100644 --- a/css/plugins/file.css +++ b/css/plugins/file.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/file.min.css b/css/plugins/file.min.css index da5744308..79e34d247 100644 --- a/css/plugins/file.min.css +++ b/css/plugins/file.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/fullscreen.css b/css/plugins/fullscreen.css index b421c86df..1ce5dedb4 100644 --- a/css/plugins/fullscreen.css +++ b/css/plugins/fullscreen.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/fullscreen.min.css b/css/plugins/fullscreen.min.css index ce670e9d3..961a725fe 100644 --- a/css/plugins/fullscreen.min.css +++ b/css/plugins/fullscreen.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/help.css b/css/plugins/help.css index fbf04761f..04f808e39 100644 --- a/css/plugins/help.css +++ b/css/plugins/help.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/help.min.css b/css/plugins/help.min.css index 83148a54e..39e438f7d 100644 --- a/css/plugins/help.min.css +++ b/css/plugins/help.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/image.css b/css/plugins/image.css index 5dd992a8d..52a724cff 100644 --- a/css/plugins/image.css +++ b/css/plugins/image.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/image.min.css b/css/plugins/image.min.css index 6a4082e95..17dca062c 100644 --- a/css/plugins/image.min.css +++ b/css/plugins/image.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/image_manager.css b/css/plugins/image_manager.css index 80184515a..6431c46e3 100644 --- a/css/plugins/image_manager.css +++ b/css/plugins/image_manager.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/image_manager.min.css b/css/plugins/image_manager.min.css index 0eeacb5c7..d61b6ee00 100644 --- a/css/plugins/image_manager.min.css +++ b/css/plugins/image_manager.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/line_breaker.css b/css/plugins/line_breaker.css index 28f8258fe..271ddcf6f 100644 --- a/css/plugins/line_breaker.css +++ b/css/plugins/line_breaker.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/line_breaker.min.css b/css/plugins/line_breaker.min.css index 09f11ea38..3e4f7ccd1 100644 --- a/css/plugins/line_breaker.min.css +++ b/css/plugins/line_breaker.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/quick_insert.css b/css/plugins/quick_insert.css index 4d7ed6d7c..1ada63511 100644 --- a/css/plugins/quick_insert.css +++ b/css/plugins/quick_insert.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/quick_insert.min.css b/css/plugins/quick_insert.min.css index 099ee5787..1e85de795 100644 --- a/css/plugins/quick_insert.min.css +++ b/css/plugins/quick_insert.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/table.css b/css/plugins/table.css index cdb521e8e..3518155c6 100644 --- a/css/plugins/table.css +++ b/css/plugins/table.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/table.min.css b/css/plugins/table.min.css index 05bb01abd..c02ea998e 100644 --- a/css/plugins/table.min.css +++ b/css/plugins/table.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/video.css b/css/plugins/video.css index c9ab77571..a387f30e9 100644 --- a/css/plugins/video.css +++ b/css/plugins/video.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/plugins/video.min.css b/css/plugins/video.min.css index d6f39cdc6..9c380e722 100644 --- a/css/plugins/video.min.css +++ b/css/plugins/video.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/dark.css b/css/themes/dark.css index 8a53c15a3..5246b1288 100644 --- a/css/themes/dark.css +++ b/css/themes/dark.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/dark.min.css b/css/themes/dark.min.css index ffedb7248..49c75e1e4 100644 --- a/css/themes/dark.min.css +++ b/css/themes/dark.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/gray.css b/css/themes/gray.css index eafd0001b..d548fc145 100644 --- a/css/themes/gray.css +++ b/css/themes/gray.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/gray.min.css b/css/themes/gray.min.css index fa9d75d8a..530999054 100644 --- a/css/themes/gray.min.css +++ b/css/themes/gray.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/red.css b/css/themes/red.css index cf6b8d488..f26e75726 100644 --- a/css/themes/red.css +++ b/css/themes/red.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/red.min.css b/css/themes/red.min.css index 1ccf39e9f..d8c79a940 100644 --- a/css/themes/red.min.css +++ b/css/themes/red.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/royal.css b/css/themes/royal.css index 87ef63858..308477cee 100644 --- a/css/themes/royal.css +++ b/css/themes/royal.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/css/themes/royal.min.css b/css/themes/royal.min.css index 786e0aa6b..359b0324f 100644 --- a/css/themes/royal.min.css +++ b/css/themes/royal.min.css @@ -1,5 +1,5 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ diff --git a/js/froala_editor.min.js b/js/froala_editor.min.js index 2e74f74e6..a6ea9707a 100644 --- a/js/froala_editor.min.js +++ b/js/froala_editor.min.js @@ -1,10 +1,10 @@ /*! - * froala_editor v2.4.0 (https://www.froala.com/wysiwyg-editor) + * froala_editor v2.4.0-rc1 (https://www.froala.com/wysiwyg-editor) * License https://froala.com/wysiwyg-editor/terms/ * Copyright 2014-2016 Froala Labs */ -!function(a){"function"==typeof define&&define.amd?define(["jquery"],a):"object"==typeof module&&module.exports?module.exports=function(b,c){return void 0===c&&(c="undefined"!=typeof window?require("jquery"):require("jquery")(b)),a(c),c}:a(jQuery)}(function(a){var b=function(c,d){this.id=++a.FE.ID,this.opts=a.extend(!0,{},a.extend({},b.DEFAULTS,"object"==typeof d&&d));var e=JSON.stringify(this.opts);a.FE.OPTS_MAPPING[e]=a.FE.OPTS_MAPPING[e]||this.id,this.sid=a.FE.OPTS_MAPPING[e],a.FE.SHARED[this.sid]=a.FE.SHARED[this.sid]||{},this.shared=a.FE.SHARED[this.sid],this.shared.count=(this.shared.count||0)+1,this.$oel=a(c),this.$oel.data("froala.editor",this),this.o_doc=c.ownerDocument,this.o_win="defaultView"in this.o_doc?this.o_doc.defaultView:this.o_doc.parentWindow;var f=a(this.o_win).scrollTop();this.$oel.on("froala.doInit",a.proxy(function(){this.$oel.off("froala.doInit"),this.doc=this.$el.get(0).ownerDocument,this.win="defaultView"in this.doc?this.doc.defaultView:this.doc.parentWindow,this.$doc=a(this.doc),this.$win=a(this.win),this.opts.pluginsEnabled||(this.opts.pluginsEnabled=Object.keys(a.FE.PLUGINS)),this.opts.initOnClick?(this.load(a.FE.MODULES),this.$el.on("touchstart.init",function(){a(this).data("touched",!0)}),this.$el.on("touchmove.init",function(){a(this).removeData("touched")}),this.$el.on("mousedown.init touchend.init dragenter.init focus.init",a.proxy(function(b){if("touchend"==b.type&&!this.$el.data("touched"))return!0;if(1===b.which||!b.which){this.$el.off("mousedown.init touchstart.init touchmove.init touchend.init dragenter.init focus.init"),this.load(a.FE.MODULES),this.load(a.FE.PLUGINS);var c=b.originalEvent&&b.originalEvent.originalTarget;c&&"IMG"==c.tagName&&a(c).trigger("mousedown"),"undefined"==typeof this.ul&&this.destroy(),"touchend"==b.type&&this.image&&b.originalEvent&&b.originalEvent.target&&a(b.originalEvent.target).is("img")&&setTimeout(a.proxy(function(){this.image.edit(a(b.originalEvent.target))},this),100),this.ready=!0,this.events.trigger("initialized")}},this))):(this.load(a.FE.MODULES),this.load(a.FE.PLUGINS),a(this.o_win).scrollTop(f),"undefined"==typeof this.ul&&this.destroy(),this.ready=!0,this.events.trigger("initialized"))},this)),this._init()};b.DEFAULTS={initOnClick:!1,pluginsEnabled:null},b.MODULES={},b.PLUGINS={},b.VERSION="2.4.0",b.INSTANCES=[],b.OPTS_MAPPING={},b.SHARED={},b.ID=0,b.prototype._init=function(){var b=this.$oel.prop("tagName"),c=a.proxy(function(){"TEXTAREA"!=b&&(this._original_html=this._original_html||this.$oel.html()),this.$box=this.$box||this.$oel,this.opts.fullPage&&(this.opts.iframe=!0),this.opts.iframe?(this.$iframe=a('