Update to V2.4.0.

froala · Dec 9, 2016 · 8031ed9 · 8031ed9
1 parent 73013f2
commit 8031ed9
Show file tree

Hide file tree

Showing 88 changed files with 204 additions and 183 deletions.
diff --git a/README.md b/README.md
@@ -54,6 +54,7 @@ $this->Html->script(
     '/Froala/js/plugins/font_family.min.js',
     '/Froala/js/plugins/font_size.min.js',
     '/Froala/js/plugins/fullscreen.min.js',
+    '/Froala/js/plugins/help.min.js',
     '/Froala/js/plugins/image_manager.min.js',
     '/Froala/js/plugins/image.min.js',
     '/Froala/js/plugins/inline_style.min.js',
@@ -84,6 +85,7 @@ $this->Html->css(
     '/Froala/css/plugins/emoticons.min.css',
     '/Froala/css/plugins/file.min.css',
     '/Froala/css/plugins/fullscreen.min.css',
+    '/Froala/css/plugins/help.min.css',
     '/Froala/css/plugins/image_manager.min.css',
     '/Froala/css/plugins/image.min.css',
     '/Froala/css/plugins/line_breaker.min.css',

diff --git a/Test/Case/View/Helper/FroalaHelperTest.php b/Test/Case/View/Helper/FroalaHelperTest.php
@@ -172,6 +172,7 @@ public function testBeforeRender() {
           '/Froala/js/plugins/font_family.min.js',
           '/Froala/js/plugins/font_size.min.js',
           '/Froala/js/plugins/fullscreen.min.js',
+          '/Froala/js/plugins/help.min.js',
           '/Froala/js/plugins/image_manager.min.js',
           '/Froala/js/plugins/image.min.js',
           '/Froala/js/plugins/inline_style.min.js',
@@ -202,6 +203,7 @@ public function testBeforeRender() {
                   '/Froala/css/plugins/emoticons.min.css',
                   '/Froala/css/plugins/file.min.css',
                   '/Froala/css/plugins/fullscreen.min.css',
+                  '/Froala/css/plugins/help.min.css',
                   '/Froala/css/plugins/image_manager.min.css',
                   '/Froala/css/plugins/image.min.css',
                   '/Froala/css/plugins/line_breaker.min.css',

diff --git a/View/Helper/FroalaHelper.php b/View/Helper/FroalaHelper.php
@@ -101,6 +101,7 @@ public function beforeRender($viewFile) {
       '/Froala/js/plugins/font_family.min.js',
       '/Froala/js/plugins/font_size.min.js',
       '/Froala/js/plugins/fullscreen.min.js',
+      '/Froala/js/plugins/help.min.js',
       '/Froala/js/plugins/image_manager.min.js',
       '/Froala/js/plugins/image.min.js',
       '/Froala/js/plugins/inline_style.min.js',
@@ -125,6 +126,7 @@ public function beforeRender($viewFile) {
         '/Froala/css/plugins/emoticons.min.css',
         '/Froala/css/plugins/file.min.css',
         '/Froala/css/plugins/fullscreen.min.css',
+        '/Froala/css/plugins/help.min.css',
         '/Froala/css/plugins/image_manager.min.css',
         '/Froala/css/plugins/image.min.css',
         '/Froala/css/plugins/line_breaker.min.css',

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "froala/wysiwyg-cake",
-  "version": "2.3.5",
+  "version": "2.4.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": [

diff --git a/webroot/css/froala_editor.min.css b/webroot/css/froala_editor.min.css
diff --git a/webroot/css/froala_style.min.css b/webroot/css/froala_style.min.css
diff --git a/webroot/css/plugins/char_counter.min.css b/webroot/css/plugins/char_counter.min.css
diff --git a/webroot/css/plugins/code_view.min.css b/webroot/css/plugins/code_view.min.css