Merge branch 'master' into feature/html-attributes

Author: travist

Changelog.md

@@ -8,6 +8,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ### Added
  - Ability to provide HTML attributes for components inputs
 
+## 3.22.15
+### Changed
+ - FOR-2415: Set file component to image mode by default when added via PDF builder
+ - FOR-2416: Increase default size of file component PDF overlay
+ - FOR-2417: Fix CSS rule for white-space:pre-wrap
+ - Upgraded [email protected], [email protected], [email protected], [email protected]
+
+### Fixed
+ - Fix bugs with day component
+ - FOR-2379: Update CKE to 12.2.0-formio.2, enable image support
+
 ## 3.22.14
 ### Changed
  - Reverted https://github.com/formio/formio.js/pull/1428 because it was causing issues with TextArea wysiwyg with default submissions showing up.

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "formiojs",
   "description": "Common js library for client side interaction with <form.io>",
-  "version": "3.22.14",
+  "version": "3.22.15",
   "main": "dist/formio.min.js",
   "license": "MIT",
   "homepage": "https://github.com/formio/formio.js",

dist/formio.builder.css

@@ -118,10 +118,12 @@ dialog.fixed {
   display: none; }
 
 /* Force native + Ace textareas to use pre-wrap whitespace in readonly mode (preserves visual linebreaks) */
-.formio-disabled-input.formio-component-nativeTextArea > .well,
-.formio-disabled-input.formio-component-ace > .well {
+.formio-disabled-input.formio-component-textarea > .well {
   white-space: pre-wrap; }
 
+.formio-disabled-input.formio-component-textarea > .well * {
+  white-space: initial; }
+
 /* Force all textareas to break long words when overflowing (if width is set) */
 .formio-disabled-input.formio-component-textarea .well {
   overflow-wrap: break-word; }

dist/formio.builder.min.css

@@ -95,10 +95,12 @@ dialog.fixed {
   display: none; }
 
 /* Force native + Ace textareas to use pre-wrap whitespace in readonly mode (preserves visual linebreaks) */
-.formio-disabled-input.formio-component-nativeTextArea > .well,
-.formio-disabled-input.formio-component-ace > .well {
+.formio-disabled-input.formio-component-textarea > .well {
   white-space: pre-wrap; }
 
+.formio-disabled-input.formio-component-textarea > .well * {
+  white-space: initial; }
+
 /* Force all textareas to break long words when overflowing (if width is set) */
 .formio-disabled-input.formio-component-textarea .well {
   overflow-wrap: break-word; }

dist/formio.contrib.js

@@ -2456,10 +2456,12 @@ dialog.fixed {
   display: none; }
 
 /* Force native + Ace textareas to use pre-wrap whitespace in readonly mode (preserves visual linebreaks) */
-.formio-disabled-input.formio-component-nativeTextArea > .well,
-.formio-disabled-input.formio-component-ace > .well {
+.formio-disabled-input.formio-component-textarea > .well {
   white-space: pre-wrap; }
 
+.formio-disabled-input.formio-component-textarea > .well * {
+  white-space: initial; }
+
 /* Force all textareas to break long words when overflowing (if width is set) */
 .formio-disabled-input.formio-component-textarea .well {
   overflow-wrap: break-word; }