Add latest changes from gitlab-org/gitlab@master

2 files changed, 8 insertions, 7 deletions

diff --git a/app/assets/javascripts/static_site_editor/components/edit_area.vue b/app/assets/javascripts/static_site_editor/components/edit_area.vue
index e9efef40632..b8c6be51afa 100644
--- a/app/assets/javascripts/static_site_editor/components/edit_area.vue
+++ b/app/assets/javascripts/static_site_editor/components/edit_area.vue
@@ -58,15 +58,16 @@ export default {
   methods: {
     syncSource() {
       if (this.isWysiwygMode) {
-        this.parsedSource.syncBody();
+        this.parsedSource.syncBodyToRaw();
         return;
       }
 
-      this.parsedSource.syncRaw();
+      this.parsedSource.syncRawToBody();
     },
     onModeChange(mode) {
-      this.editorMode = mode;
+      // Sequentially sync then switch modes (rich-content-editor's v-model computed source content update)
       this.syncSource();
+      this.editorMode = mode;
     },
     onSubmit() {
       this.syncSource();
diff --git a/app/assets/javascripts/static_site_editor/services/parse_source_file.js b/app/assets/javascripts/static_site_editor/services/parse_source_file.js
index f32c693411f..c22bd1d27f2 100644
--- a/app/assets/javascripts/static_site_editor/services/parse_source_file.js
+++ b/app/assets/javascripts/static_site_editor/services/parse_source_file.js
@@ -24,7 +24,7 @@ const parseSourceFile = raw => {
 
   const computedRaw = () => `${editable.header}${editable.spacing}${editable.body}`;
 
-  const syncBody = () => {
+  const syncRawToBody = () => {
     /*
     We re-parse as markdown editing could have added non-body changes (preFrontMatter, frontMatter, or spacing).
     Re-parsing additionally gets us the desired body that was extracted from the mutated editable.raw
@@ -33,7 +33,7 @@ const parseSourceFile = raw => {
     Object.assign(editable, parse(editable.raw));
   };
 
-  const syncRaw = () => {
+  const syncBodyToRaw = () => {
     editable.raw = computedRaw();
   };
 
@@ -47,8 +47,8 @@ const parseSourceFile = raw => {
     editable,
     isModifiedRaw,
     isModifiedBody,
-    syncRaw,
-    syncBody,
+    syncBodyToRaw,
+    syncRawToBody,
   };
 };