Update to v2.9.7

froala · Apr 23, 2020 · bd37748 · bd37748
1 parent 54e5b88
commit bd37748
Show file tree

Hide file tree

Showing 131 changed files with 357 additions and 298 deletions.
diff --git a/composer.json b/composer.json
@@ -1,6 +1,6 @@
 {
   "name": "froala/wysiwyg-cake2",
-  "version": "2.9.6",
+  "version": "2.9.7",
   "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.css b/webroot/css/froala_editor.css
@@ -1,7 +1,7 @@
 /*!
- * froala_editor v2.9.6 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.9.7 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2019 Froala Labs
+ * Copyright 2014-2020 Froala Labs
  */
 
 .clearfix::after {
@@ -152,9 +152,11 @@ iframe.fr-iframe {
   left: 0;
   right: 0;
   overflow: hidden;
+  pointer-events: none;
 }
 .fr-wrapper.show-placeholder .fr-placeholder {
   display: block;
+  position: relative;
 }
 .fr-wrapper ::-moz-selection {
   background: #b5d6fd;
@@ -197,7 +199,7 @@ iframe.fr-iframe {
 }
 @media (min-width: 992px) {
   .fr-box.fr-document {
-    min-width: 21cm;
+    min-width: calc(21cm + 30px + 30px);
   }
   .fr-box.fr-document .fr-wrapper {
     text-align: left;
@@ -215,7 +217,8 @@ iframe.fr-iframe {
     -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
-    overflow: visible;
+    /* https://github.com/froala-labs/froala-editor-js-2/issues/1531 */
+    /* Removed overflow: visible; */
     z-index: auto;
   }
   .fr-box.fr-document .fr-wrapper .fr-element hr {

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,7 +1,7 @@
 /*!
- * froala_editor v2.9.6 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.9.7 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2019 Froala Labs
+ * Copyright 2014-2020 Froala Labs
  */
 
 .clearfix::after {
@@ -152,9 +152,11 @@ iframe.fr-iframe {
   left: 0;
   right: 0;
   overflow: hidden;
+  pointer-events: none;
 }
 .fr-wrapper.show-placeholder .fr-placeholder {
   display: block;
+  position: relative;
 }
 .fr-wrapper ::-moz-selection {
   background: #b5d6fd;
@@ -197,7 +199,7 @@ iframe.fr-iframe {
 }
 @media (min-width: 992px) {
   .fr-box.fr-document {
-    min-width: 21cm;
+    min-width: calc(21cm + 30px + 30px);
   }
   .fr-box.fr-document .fr-wrapper {
     text-align: left;
@@ -215,7 +217,8 @@ iframe.fr-iframe {
     -webkit-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
     -moz-box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
     box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 1px 1px rgba(0, 0, 0, 0.16);
-    overflow: visible;
+    /* https://github.com/froala-labs/froala-editor-js-2/issues/1531 */
+    /* Removed overflow: visible; */
     z-index: auto;
   }
   .fr-box.fr-document .fr-wrapper .fr-element hr {
@@ -1953,6 +1956,7 @@ body.fr-fullscreen {
 }
 .fr-element img {
   cursor: pointer;
+  padding: 0 1px;
 }
 .fr-image-resizer {
   position: absolute;

diff --git a/webroot/css/froala_editor.pkgd.min.css b/webroot/css/froala_editor.pkgd.min.css
diff --git a/webroot/css/froala_style.css b/webroot/css/froala_style.css
@@ -1,7 +1,7 @@
 /*!
- * froala_editor v2.9.6 (https://www.froala.com/wysiwyg-editor)
+ * froala_editor v2.9.7 (https://www.froala.com/wysiwyg-editor)
  * License https://froala.com/wysiwyg-editor/terms/
- * Copyright 2014-2019 Froala Labs
+ * Copyright 2014-2020 Froala Labs
  */
 
 .clearfix::after {
@@ -221,7 +221,7 @@ img.fr-shadow,
 }
 .fr-view img.fr-dii.fr-fil {
   float: left;
-  margin: 5px 5px 5px 0;
+  margin: 5px 25px 5px 0;
   max-width: calc(100% - 5px);
 }
 .fr-view img.fr-dii.fr-fir {
@@ -257,7 +257,7 @@ img.fr-shadow,
 }
 .fr-view span.fr-img-caption.fr-dii.fr-fil {
   float: left;
-  margin: 5px 5px 5px 0;
+  margin: 5px 25px 5px 0;
   max-width: calc(100% - 5px);
 }
 .fr-view span.fr-img-caption.fr-dii.fr-fir {
@@ -362,6 +362,10 @@ img.fr-shadow,
 .fr-view textarea.fr-large {
   font-size: 24px;
 }
+.fr-view ul,
+.fr-view ol {
+  list-style-position: inside;
+}
 /**
  * Image style.
  */
@@ -402,7 +406,7 @@ img.fr-view.fr-dii {
 }
 img.fr-view.fr-dii.fr-fil {
   float: left;
-  margin: 5px 5px 5px 0;
+  margin: 5px 25px 5px 0;
   max-width: calc(100% - 5px);
 }
 img.fr-view.fr-dii.fr-fir {
@@ -438,7 +442,7 @@ span.fr-img-caption.fr-view.fr-dii {
 }
 span.fr-img-caption.fr-view.fr-dii.fr-fil {
   float: left;
-  margin: 5px 5px 5px 0;
+  margin: 5px 25px 5px 0;
   max-width: calc(100% - 5px);
 }
 span.fr-img-caption.fr-view.fr-dii.fr-fir {

diff --git a/webroot/css/froala_style.min.css b/webroot/css/froala_style.min.css