Update to v2.7.0.

froala · Sep 19, 2017 · 459f76b · 459f76b
1 parent 77189c2
commit 459f76b
Show file tree

Hide file tree

Showing 123 changed files with 597 additions and 195 deletions.
diff --git a/Test/Case/View/Helper/FroalaHelperTest.php b/Test/Case/View/Helper/FroalaHelperTest.php
@@ -166,14 +166,15 @@ public function testBeforeRender() {
           '/Froala/js/plugins/code_view.min.js',
           '/Froala/js/plugins/colors.min.js',
           '/Froala/js/plugins/draggable.min.js',
+					'/Froala/js/third_party/embedly.min.js',
           '/Froala/js/plugins/emoticons.min.js',
           '/Froala/js/plugins/entities.min.js',
           '/Froala/js/plugins/file.min.js',
           '/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_aviary.min.js',
+          '/Froala/js/third_party/image_aviary.min.js',
           '/Froala/js/plugins/image_manager.min.js',
           '/Froala/js/plugins/image.min.js',
           '/Froala/js/plugins/inline_style.min.js',
@@ -187,7 +188,7 @@ public function testBeforeRender() {
           '/Froala/js/plugins/quote.min.js',
           '/Froala/js/plugins/save.min.js',
           '/Froala/js/plugins/special_characters.min.js',
-          '/Froala/js/plugins/spell_checker.min.js',
+          '/Froala/js/third_party/spell_checker.min.js',
           '/Froala/js/plugins/table.min.js',
           '/Froala/js/plugins/url.min.js',
           '/Froala/js/plugins/video.min.js',
@@ -205,6 +206,7 @@ public function testBeforeRender() {
                   '/Froala/css/plugins/code_view.min.css',
                   '/Froala/css/plugins/colors.min.css',
                   '/Froala/css/plugins/draggable.min.css',
+									'/Froala/css/third_party/embedly.min.css',
                   '/Froala/css/plugins/emoticons.min.css',
                   '/Froala/css/plugins/file.min.css',
                   '/Froala/css/plugins/fullscreen.min.css',
@@ -214,7 +216,7 @@ public function testBeforeRender() {
                   '/Froala/css/plugins/line_breaker.min.css',
                   '/Froala/css/plugins/quick_insert.min.css',
                   '/Froala/css/plugins/special_characters.min.css',
-                  '/Froala/css/plugins/spell_checker.min.css',
+                  '/Froala/css/third_party/spell_checker.min.css',
                   '/Froala/css/plugins/table.min.css',
                   '/Froala/css/plugins/video.min.css'
                 ));

diff --git a/View/Helper/FroalaHelper.php b/View/Helper/FroalaHelper.php
@@ -95,14 +95,15 @@ public function beforeRender($viewFile) {
       '/Froala/js/plugins/code_view.min.js',
       '/Froala/js/plugins/colors.min.js',
       '/Froala/js/plugins/draggable.min.js',
+			'/Froala/js/third_party/embedly.min.js',
       '/Froala/js/plugins/emoticons.min.js',
       '/Froala/js/plugins/entities.min.js',
       '/Froala/js/plugins/file.min.js',
       '/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_aviary.min.js',
+      '/Froala/js/third_party/image_aviary.min.js',
       '/Froala/js/plugins/image_manager.min.js',
       '/Froala/js/plugins/image.min.js',
       '/Froala/js/plugins/inline_style.min.js',
@@ -116,7 +117,7 @@ public function beforeRender($viewFile) {
       '/Froala/js/plugins/quote.min.js',
       '/Froala/js/plugins/save.min.js',
       '/Froala/js/plugins/special_characters.min.js',
-      '/Froala/js/plugins/spell_checker.min.js',
+      '/Froala/js/third_party/spell_checker.min.js',
       '/Froala/js/plugins/table.min.js',
       '/Froala/js/plugins/url.min.js',
       '/Froala/js/plugins/video.min.js',
@@ -128,6 +129,7 @@ public function beforeRender($viewFile) {
         '/Froala/css/plugins/code_view.min.css',
         '/Froala/css/plugins/colors.min.css',
         '/Froala/css/plugins/draggable.min.css',
+				'/Froala/css/third_party/embedly.min.css',
         '/Froala/css/plugins/emoticons.min.css',
         '/Froala/css/plugins/file.min.css',
         '/Froala/css/plugins/fullscreen.min.css',
@@ -137,7 +139,7 @@ public function beforeRender($viewFile) {
         '/Froala/css/plugins/line_breaker.min.css',
         '/Froala/css/plugins/quick_insert.min.css',
         '/Froala/css/plugins/special_characters.min.css',
-        '/Froala/css/plugins/spell_checker.min.css',
+        '/Froala/css/third_party/spell_checker.min.css',
         '/Froala/css/plugins/table.min.css',
         '/Froala/css/plugins/video.min.css'
       )

diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "froala/wysiwyg-cake2",
-  "version": "2.6.6",
+  "version": "2.7.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": [
@@ -21,7 +21,7 @@
   "license": [
     "One Website",
     "Advanced",
-    "OEM"
+    "Business"
   ],
   "authors": [
     {

diff --git a/webroot/css/froala_editor.css b/webroot/css/froala_editor.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.6.6 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.7.0 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
  * Copyright 2014-2017 Froala Labs
  */
@@ -26,12 +26,12 @@
 }
 .fr-box.fr-basic .fr-element {
   color: #000000;
-  padding: 10px;
+  padding: 16px;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   overflow-x: auto;
-  min-height: 40px;
+  min-height: 52px;
 }
 .fr-box.fr-basic.fr-rtl .fr-element {
   text-align: right;

diff --git a/webroot/css/froala_editor.min.css b/webroot/css/froala_editor.min.css
diff --git a/webroot/css/froala_editor.pkgd.css b/webroot/css/froala_editor.pkgd.css
@@ -1,5 +1,5 @@
 /*!
- * froala_editor v2.6.6 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.7.0 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
  * Copyright 2014-2017 Froala Labs
  */
@@ -26,12 +26,12 @@
 }
 .fr-box.fr-basic .fr-element {
   color: #000000;
-  padding: 10px;
+  padding: 16px;
   -webkit-box-sizing: border-box;
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   overflow-x: auto;
-  min-height: 40px;
+  min-height: 52px;
 }
 .fr-box.fr-basic.fr-rtl .fr-element {
   text-align: right;
@@ -1471,6 +1471,36 @@ textarea.fr-code {
   -ms-transform: translate3d(-100%, 0, 0);
   -o-transform: translate3d(-100%, 0, 0);
 }
+.fr-popup .fr-color-hex-layer {
+  width: 100%;
+  margin: 0px;
+  padding: 10px;
+}
+.fr-popup .fr-color-hex-layer .fr-input-line {
+  float: left;
+  width: calc(100% - 50px);
+  padding: 8px 0 0;
+}
+.fr-popup .fr-color-hex-layer .fr-action-buttons {
+  float: right;
+  width: 50px;
+}
+.fr-popup .fr-color-hex-layer .fr-action-buttons button {
+  background-color: #1e88e5;
+  color: #FFF;
+  border-radius: 4px;
+  -moz-border-radius: 4px;
+  -webkit-border-radius: 4px;
+  -moz-background-clip: padding;
+  -webkit-background-clip: padding-box;
+  background-clip: padding-box;
+  font-size: 13px;
+  height: 32px;
+}
+.fr-popup .fr-color-hex-layer .fr-action-buttons button:hover {
+  background-color: #166dba;
+  color: #FFF;
+}
 .fr-popup .fr-separator + .fr-colors-tabs {
   -webkit-box-shadow: none;
   -moz-box-shadow: none;
@@ -2384,7 +2414,7 @@ div.fr-modal-body div.fr-image-list div.fr-image-container .fr-insert-img {
 .fr-qi-helper {
   position: absolute;
   z-index: 3;
-  padding-left: 10px;
+  padding-left: 16px;
   white-space: nowrap;
 }
 .fr-qi-helper a.fr-btn.fr-floating-btn {

diff --git a/webroot/css/froala_editor.pkgd.min.css b/webroot/css/froala_editor.pkgd.min.css