Merge remote-tracking branch 'origin/dev' into dev

src/frontend/views/my-course/edit.php

@@ -56,7 +56,7 @@ AppAsset::addCss($this, '@web/assets/css/course_publish.css');
 				<?php } ?>
 			</div>
 		</div>
-		<component :is="dynamicVideo" uptoken="<?=$videoToken?>" ref="video"></component>
+		<component :is="dynamicVideo" uptoken="<?=$videoToken?>"></component>
 	</div>
 
 	<div class="cls-part">

src/frontend/web/js/components/uploader/video-upload.vue

@@ -27,6 +27,7 @@ import filesize from "file-size";
 import layer from "layer-js";
 import str from "../../utils/string";
 import qiniu from "../../utils/qiniu";
+import Bus from "../bus";
 
 var uploader;
 
@@ -50,7 +51,9 @@ export default {
             this.state = "ready";
             uploader.refresh();
 
+            //本组件的所有视频上传相关事件都会同时向 Bus 发送
             this.$emit("video-upload-cancel");
+            Bus.$emit("video-upload-cancel");
         }
     },
     mounted() {
@@ -132,6 +135,7 @@ export default {
                         var response = $.parseJSON(info.response);
 
                         self.$emit("video-uploaded", file.name, response);
+                        Bus.$emit("video-uploaded", file.name, response);
                     },
                     'Error': function(up, err) {
                         var msg = "";
@@ -160,6 +164,7 @@ export default {
                 }
 
                 self.$emit("video-upload-state-change", val, old);
+                Bus.$emit("video-upload-state-change", val, old);
             });
 
             uploader.init();

src/frontend/web/js/my-course/edit.js

@@ -9,6 +9,7 @@ var richText = require('./rich-text');
 var layer = require("layer-js");
 var str = require("../utils/string");
 var commonPart = require('./common-part');
+var Bus = require("../components/bus");
 
 require('jquery-validation');
 
@@ -29,14 +30,6 @@ var vm = new Vue({
 		removeVideoClick: function() {
 			this.dynamicVideo = "videoUpload";
 			this.vuid = "";
-
-			this.$refs.video.$on("video-uploaded", function(name, data) {
-				self.vuid = data.uuid;
-			});
-
-			this.$refs.video.$on("video-upload-cancel", function() {
-				self.vuid = "@orig";
-			});
 		}
 	},
 	mounted: function() {
@@ -46,6 +39,14 @@ var vm = new Vue({
 			self.previewKey = data.uuid;
 		});
 
+		Bus.$on("video-uploaded", function(name, data) {
+			self.vuid = data.uuid;
+		});
+
+		Bus.$on("video-upload-cancel", function() {
+			self.vuid = "@orig";
+		});
+
 		var form = document.forms["courseEdit"];
 		var opt = commonPart.generateValidateOption(form);