Bug fixes

Author: KB1RD

components/DocumentEditor.vue

@@ -14,6 +14,7 @@
           v-model="text"
           style="text-align: left; margin: -24px -32px; margin-top: 3em; overflow: auto;"
           :options="cmOption"
+          @ready="$emit('ready')"
           @changes="onNewChanges"
         />
       </client-only>

nuxt.config.js

@@ -64,5 +64,8 @@ export default {
   // axios: {},
   build: {
     extend(config, ctx) {}
+  },
+  generate: {
+    routes: ['404']
   }
 }

package.json

@@ -9,7 +9,7 @@
     "dev": "nuxt",
     "build": "nuxt build",
     "start": "nuxt start",
-    "generate": "nuxt generate",
+    "generate": "nuxt generate; mv dist/404/index.html dist/404.html; rm -rf dist/404/",
     "lint": "eslint --ext .js,.vue --ignore-path .gitignore .",
     "test": "jest"
   },

pages/edit/_room.vue

@@ -27,6 +27,7 @@
         v-if="!has_fatal_error"
         ref="editor"
         :loading="is_busy || is_reconnecting"
+        @ready="cm_ready = true"
         @settings-clicked="openMatrixSetup"
         @insert="(i) => (documentInsert ? documentInsert(i) : undefined)"
         @remove="(r) => (documentRemove ? documentRemove(r) : undefined)"
@@ -60,8 +61,18 @@ export default {
 
   data() {
     return {
-      has_fatal_error: false
-      // setup_visible: false
+      has_fatal_error: false,
+      // setup_visible: false,
+      cm_ready: false,
+      cm_resolve_ready: undefined
+    }
+  },
+
+  watch: {
+    cm_ready() {
+      if (this.cm_ready && this.cm_resolve_ready) {
+        this.cm_resolve_ready()
+      }
     }
   },
 
@@ -88,6 +99,14 @@ export default {
       'watchBlockingOperation',
       (async () => {
         try {
+          // A poorly written system to wait for CodeMirror to be ready
+          await new Promise((resolve, reject) => {
+            if (self.cm_ready) {
+              resolve()
+            } else {
+              self.cm_resolve_ready = resolve
+            }
+          })
           const doc = await self.$matrix.createDocument(
             this.$route.params.room,
             this.$refs.editor.insert,