Skip to content

Commit

Permalink
Update to 2.2.0.
Browse files Browse the repository at this point in the history
  • Loading branch information
stefanneculai committed Feb 29, 2016
1 parent 84a783f commit 1b6c274
Show file tree
Hide file tree
Showing 84 changed files with 311 additions and 189 deletions.
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ $this->Html->script(
'/Froala/js/plugins/code_beautifier.min.js',
'/Froala/js/plugins/code_view.min.js',
'/Froala/js/plugins/colors.min.js',
'/Froala/js/plugins/draggable.min.js',
'/Froala/js/plugins/emoticons.min.js',
'/Froala/js/plugins/entities.min.js',
'/Froala/js/plugins/file.min.js',
Expand Down Expand Up @@ -74,6 +75,7 @@ $this->Html->css(
'/Froala/css/plugins/char_counter.min.css',
'/Froala/css/plugins/code_view.min.css',
'/Froala/css/plugins/colors.min.css',
'/Froala/css/plugins/draggable.min.css',
'/Froala/css/plugins/emoticons.min.css',
'/Froala/css/plugins/file.min.css',
'/Froala/css/plugins/fullscreen.min.css',
Expand Down
2 changes: 2 additions & 0 deletions Test/Case/View/Helper/FroalaHelperTest.php
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,7 @@ public function testBeforeRender() {
'/Froala/js/plugins/code_beautifier.min.js',
'/Froala/js/plugins/code_view.min.js',
'/Froala/js/plugins/colors.min.js',
'/Froala/js/plugins/draggable.min.js',
'/Froala/js/plugins/emoticons.min.js',
'/Froala/js/plugins/entities.min.js',
'/Froala/js/plugins/file.min.js',
Expand Down Expand Up @@ -197,6 +198,7 @@ public function testBeforeRender() {
'/Froala/css/plugins/char_counter.min.css',
'/Froala/css/plugins/code_view.min.css',
'/Froala/css/plugins/colors.min.css',
'/Froala/css/plugins/draggable.min.css',
'/Froala/css/plugins/emoticons.min.css',
'/Froala/css/plugins/file.min.css',
'/Froala/css/plugins/fullscreen.min.css',
Expand Down
2 changes: 2 additions & 0 deletions View/Helper/FroalaHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,7 @@ public function beforeRender($viewFile) {
'/Froala/js/plugins/code_beautifier.min.js',
'/Froala/js/plugins/code_view.min.js',
'/Froala/js/plugins/colors.min.js',
'/Froala/js/plugins/draggable.min.js',
'/Froala/js/plugins/emoticons.min.js',
'/Froala/js/plugins/entities.min.js',
'/Froala/js/plugins/file.min.js',
Expand All @@ -120,6 +121,7 @@ public function beforeRender($viewFile) {
'/Froala/css/plugins/char_counter.min.css',
'/Froala/css/plugins/code_view.min.css',
'/Froala/css/plugins/colors.min.css',
'/Froala/css/plugins/draggable.min.css',
'/Froala/css/plugins/emoticons.min.css',
'/Froala/css/plugins/file.min.css',
'/Froala/css/plugins/fullscreen.min.css',
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "froala/wysiwyg-cake",
"version": "2.1.0",
"version": "2.2.0",
"description": "A beautiful jQuery WYSIWYG text editor based on HTML5 technology. Cross browser, with mobile support, high performance and Retina Ready modern design.",
"type": "cakephp-plugin",
"keywords": [
Expand Down
4 changes: 2 additions & 2 deletions webroot/css/froala_editor.min.css

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions webroot/css/froala_style.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/char_counter.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/code_view.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/colors.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions webroot/css/plugins/draggable.min.css
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
/*!
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* Copyright 2014-2016 Froala Labs
*/

.clearfix::after{clear:both;display:block;content:""}.fr-drag-helper{background:#1e88e5;height:2px;margin-top:-1px;-webkit-opacity:.2;-moz-opacity:.2;opacity:.2;-ms-filter:"alpha(Opacity=0)";position:absolute;z-index:9999;display:none}.fr-drag-helper.fr-visible{display:block}.fr-dragging{-webkit-opacity:.4;-moz-opacity:.4;opacity:.4;-ms-filter:"alpha(Opacity=0)"}
2 changes: 1 addition & 1 deletion webroot/css/plugins/emoticons.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.1.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* Copyright 2014-2016 Froala Labs
*/
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/plugins/file.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/fullscreen.min.css
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* froala_editor v2.1.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* Copyright 2014-2016 Froala Labs
*/
Expand Down
2 changes: 1 addition & 1 deletion webroot/css/plugins/image.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion webroot/css/plugins/image_manager.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions webroot/css/plugins/line_breaker.min.css
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
/*!
* froala_editor v2.1.0 (https://www.froala.com/wysiwyg-editor)
* froala_editor v2.2.0 (https://www.froala.com/wysiwyg-editor)
* License https://froala.com/wysiwyg-editor/terms
* Copyright 2014-2016 Froala Labs
*/

.clearfix::after{clear:both;display:block;content:""}.fr-line-breaker{cursor:text;border-top:1px solid #1e88e5;position:fixed;z-index:2;display:none}.fr-line-breaker a.fr-floating-btn{position:absolute;left:calc(50% - (32px / 2));top:-16px}
.clearfix::after{clear:both;display:block;content:""}.fr-line-breaker{cursor:text;border-top:1px solid #1e88e5;position:fixed;z-index:2;display:none}.fr-line-breaker.fr-visible{display:block}.fr-line-breaker a.fr-floating-btn{position:absolute;left:calc(50% - (32px / 2));top:-16px}
4 changes: 2 additions & 2 deletions webroot/css/plugins/quick_insert.min.css

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 1b6c274

Please sign in to comment.