update to v4.0.5

Author: surmon

CHANGELOG.md

@@ -1,6 +1,10 @@
 
 ## CHANGELOG
 
+### v4.0.5
+
+Enable switching from/to DiffView based on 'merge' prop status(merge pr 65).
+
 ### v4.0.4
 
 optimize events and refresh function.

dist/vue-codemirror.js

@@ -1,7 +1,7 @@
 {
   "name": "vue-codemirror",
   "description": "CodeMirror component for Vue",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "license": "MIT",
   "private": false,
   "author": {

package.json

@@ -85,7 +85,7 @@
         }
       },
       merge(newVal) {
-        this.$nextTick(this.switchMerge);
+        this.$nextTick(this.switchMerge)
       },
       code(newVal, oldVal) {
         this.handerCodeChange(newVal, oldVal)
@@ -185,16 +185,16 @@
       },
       switchMerge() {
         // Save current values
-        let history = this.cminstance.doc.history;
-        let cleanGeneration = this.cminstance.doc.cleanGeneration;
-        this.options.value = this.cminstance.getValue();
+        const history = this.cminstance.doc.history
+        const cleanGeneration = this.cminstance.doc.cleanGeneration
+        this.options.value = this.cminstance.getValue()
 
-        this.destroy();
-        this.initialize();
+        this.destroy()
+        this.initialize()
 
         // Restore values
-        this.cminstance.doc.history = history;
-        this.cminstance.doc.cleanGeneration = cleanGeneration;
+        this.cminstance.doc.history = history
+        this.cminstance.doc.cleanGeneration = cleanGeneration
       }
     },
     mounted() {