Merge pull request surmon-china#71 from Hades-li/master

surmon-china · web-flow · commit bf48f5305152 · 2017-07-04T10:46:45.000+08:00
修改nuxt框架下报错
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "vue-video-player",
-  "version": "3.1.1",
+  "version": "3.1.2",
   "description": "Video Player component for Vue2",
   "main": "index.js",
   "scripts": {
diff --git a/player.vue b/player.vue
@@ -100,7 +100,9 @@
         // console.log(videoOptions)
 
         // avoid error "VIDEOJS: ERROR: Unable to find plugin: __ob__"
-        delete videoOptions.plugins.__ob__
+        if (videoOptions.plugins) {
+          delete videoOptions.plugins.__ob__
+        }
         this.player = videojs(this.$el.children[0], videoOptions, function() {
 
           // player readied
diff --git a/ssr.js b/ssr.js
@@ -60,7 +60,9 @@ var videoPlayer = {
             }
           }
 
-          delete options.plugins.__ob__
+          if (options.plugins) {
+            delete options.plugins.__ob__
+          }
           // console.log(options)
 
           var eventEmit = function (vnode, name, data) {

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "vue-video-player",`
`3`		`- "version": "3.1.1",`
	`3`	`+ "version": "3.1.2",`
`4`	`4`	`"description": "Video Player component for Vue2",`
`5`	`5`	`"main": "index.js",`
`6`	`6`	`"scripts": {`
Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,9 @@ var videoPlayer = {`
`60`	`60`	`}`
`61`	`61`	`}`
`62`	`62`
`63`		`- delete options.plugins.__ob__`
	`63`	`+ if (options.plugins) {`
	`64`	`+ delete options.plugins.__ob__`
	`65`	`+ }`
`64`	`66`	`// console.log(options)`
`65`	`67`
`66`	`68`	`var eventEmit = function (vnode, name, data) {`