@formio/js 5.0.0-rc.24 → 5.0.0-rc.26

package/lib/mjs/Wizard.js

@@ -769,22 +769,21 @@ export default class Wizard extends Webform {
         }
     }
     setValue(submission, flags = {}, ignoreEstablishment) {
-        this._submission = submission;
-        if ((flags && flags.fromSubmission && (this.options.readOnly || this.editMode) && !this.isHtmlRenderMode()) ||
-            (flags && flags.fromSubmission && (this.prefixComps.length || this.suffixComps.length) && submission._id) ||
-            (this.options.server && (this.prefixComps.length || this.suffixComps.length))) {
-            this._data = submission.data;
-        }
-        if (!ignoreEstablishment) {
-            this.establishPages(submission.data);
-        }
         const changed = this.getPages({ all: true }).reduce((changed, page) => {
             return this.setNestedValue(page, submission.data, flags, changed) || changed;
         }, false);
+        if (!flags.sanitize) {
+            this.mergeData(this.data, submission.data);
+        }
         if (changed) {
             this.pageFieldLogic(this.page);
         }
         this.setEditMode(submission);
+        submission.data = this.data;
+        this._submission = submission;
+        if (!ignoreEstablishment) {
+            this.establishPages(submission.data);
+        }
         return changed;
     }
     isClickable(page, index) {

package/lib/mjs/formio.embed.js

@@ -39,6 +39,7 @@ if (thisScript) {
         config: {},
         redirect: (query.return || query.redirect),
         embedCSS: (`${config.updatePath ? config.updatePath() : scriptSrc}/formio.embed.css`),
+        success: query.success || 'Thank you for your submission!',
         before: null,
         after: null
     }, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@formio/js",
-  "version": "5.0.0-rc.24",
+  "version": "5.0.0-rc.26",
   "description": "JavaScript powered Forms with JSON Form Builder",
   "main": "lib/cjs/index.js",
   "module": "lib/mjs/index.js",
@@ -47,6 +47,7 @@
     "build-app:create-app": "node -e 'var fs=require(`fs`);fs.writeFileSync(`./_config.app.yml`, `baseurl: /` + require(`./package.json`).version + `/`);'",
     "build-app:remove-app": "rm ./_config.app.yml",
     "build-app:jekyll": "jekyll build --config _config.yml,_config.app.yml",
+    "gh-pages": "npm run build && jekyll build --config _config.yml && cd _site && git init && git remote add origin git@github.com:formio/formio.js.git && git checkout -b gh-pages && git add . && git commit -m \"Deploy to GitHub Pages\" && git push origin gh-pages --force && cd ..",
     "deploy-s3": "$(node -e 'process.stdout.write(`aws s3 cp _site s3://formiojs.test-form.io/` + require(`./package.json`).version + `/ --recursive`)')",
     "invalidate": "VERSION=$(yarn version);aws cloudfront create-invalidation --distribution-id E1MXNA5A4ZKRMZ --paths \"/$VERSION/*\"",
     "release": "yarn build-app && yarn deploy-s3",
@@ -77,7 +78,7 @@
   },
   "homepage": "https://github.com/formio/formio.js#readme",
   "dependencies": {
-    "@formio/bootstrap": "^3.0.0-rc.12",
+    "@formio/bootstrap": "^3.0.0-rc.13",
     "@formio/choices.js": "^10.2.0",
     "@formio/core": "1.3.0-rc.16",
     "@formio/text-mask-addons": "^3.8.0-formio.2",