Merge branch 'master' of github.com:surmon-china/vue-codemirror

Author: surmon-china

package.json

@@ -122,7 +122,7 @@
     "vue-template-compiler": "^2.5.2",
     "vue-template-es2015-compiler": "^1.6.0",
     "webpack": "^2.2.1",
-    "webpack-bundle-analyzer": "^2.2.1",
+    "webpack-bundle-analyzer": "^3.6.1",
     "webpack-dev-middleware": "^1.10.0",
     "webpack-hot-middleware": "^2.16.1",
     "webpack-merge": "^2.6.1"

test/unit/specs/VueCodemirror.spec.js

@@ -1,11 +1,11 @@
+import 'codemirror/mode/javascript/javascript.js'
+import 'codemirror/mode/xml/xml.js'
 
 import Codemirror from 'codemirror'
+
 import Vue from 'vue/dist/vue.js'
-import VueCodemirror, { codemirror, install } from '../../../src/index.js'
 
-// language
-import 'codemirror/mode/javascript/javascript.js'
-import 'codemirror/mode/xml/xml.js'
+import VueCodemirror, { CodeMirror, codemirror, install } from '../../../src/index.js'
 
 window.Vue = Vue
 
@@ -197,6 +197,45 @@ describe('vue-codemirror', () => {
     })
   })
 
+  describe('Emit custom event on codemirror object', () => {
+    it(' - should capture custom event', done => {
+      const eventLogs = []
+      const vm = new Vue({
+        template: `
+          <div>
+            <codemirror ref="cm"
+                        v-model="code"
+                        :events="events"
+                        @custom="onCustom">
+            </codemirror>
+          </div>
+        `,
+        data: {
+          code: '<p>test content</p>',
+          events: ['custom']
+        },
+        computed: {
+          cm() {
+            return this.$refs.cm
+          },
+          codemirror() {
+            return this.cm.codemirror
+          }
+        },
+        methods: {
+          onCustom(codemirror) {
+            eventLogs.push('onCustom')
+          }
+        }
+      }).$mount()
+      CodeMirror.signal(vm.codemirror, 'custom', vm.codemirror)
+      vm.$nextTick(() => {
+        expect(eventLogs[0]).to.deep.equal('onCustom')
+        done()
+      })
+    })
+  })
+
   // 局部安装
   describe('Local install component', () => {
     it(' - should work', done => {