fix(VideoLoader): don't control video tag's resource

ref #149
naver · Feb 13, 2018 · 68de469 · 68de469
1 parent c27870f
commit 68de469
Show file tree

Hide file tree

Showing 21 changed files with 119 additions and 107 deletions.
diff --git a/dist/PanoViewer/view360.panoviewer.js b/dist/PanoViewer/view360.panoviewer.js
diff --git a/dist/PanoViewer/view360.panoviewer.js.map b/dist/PanoViewer/view360.panoviewer.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.min.js b/dist/PanoViewer/view360.panoviewer.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.min.js.map b/dist/PanoViewer/view360.panoviewer.min.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js b/dist/PanoViewer/view360.panoviewer.pkgd.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.js.map
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js b/dist/PanoViewer/view360.panoviewer.pkgd.min.js
diff --git a/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map b/dist/PanoViewer/view360.panoviewer.pkgd.min.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.js.map b/dist/SpinViewer/view360.spinviewer.js.map
diff --git a/dist/SpinViewer/view360.spinviewer.pkgd.js.map b/dist/SpinViewer/view360.spinviewer.pkgd.js.map
diff --git a/dist/view360.js b/dist/view360.js
diff --git a/dist/view360.js.map b/dist/view360.js.map
diff --git a/dist/view360.min.js b/dist/view360.min.js
diff --git a/dist/view360.min.js.map b/dist/view360.min.js.map
diff --git a/dist/view360.pkgd.js b/dist/view360.pkgd.js
diff --git a/dist/view360.pkgd.js.map b/dist/view360.pkgd.js.map
diff --git a/dist/view360.pkgd.min.js b/dist/view360.pkgd.min.js
diff --git a/dist/view360.pkgd.min.js.map b/dist/view360.pkgd.min.js.map
diff --git a/src/PanoImageRenderer/VideoLoader.js b/src/PanoImageRenderer/VideoLoader.js
@@ -93,23 +93,23 @@ export default class VideoLoader {
 			} else {
 				this._appendSourceElement(video);
 			}
-		}
 
-		// count sources to count
-		if (!this._video.getAttribute("src")) {
-			this._sourceCount = this._video.querySelectorAll("source").length;
-		} else {
-			this._sourceCount = 1;
-		}
+			// count sources to count
+			if (!this._video.getAttribute("src")) {
+				this._sourceCount = this._video.querySelectorAll("source").length;
+			} else {
+				this._sourceCount = 1;
+			}
 
-		if (this._sourceCount > 0) {
-			if (this._video.readyState < this._thresholdReadyState) {
-				this._video.load();
-				// attach loading error listener
-				this._attachErrorHandler(this._onerror);
+			if (this._sourceCount > 0) {
+				if (this._video.readyState < this._thresholdReadyState) {
+					this._video.load();
+					// attach loading error listener
+					this._attachErrorHandler(this._onerror);
+				}
+			} else {
+				this._video = null;
 			}
-		} else {
-			this._video = null;
 		}
 	}
 

diff --git a/test/unit/PanoImageRenderer/VideoLoader.spec.js b/test/unit/PanoImageRenderer/VideoLoader.spec.js
@@ -114,29 +114,6 @@ describe("VideoLoader", function() {
 				});
 		});
 
-		it("should reject when src on video tag is invalid, and has valid sorce tags", function() {
-			// Given && When
-			const videoEl = document.createElement("video");
-			const sourceEl1 = document.createElement("source");
-			const sourceEl2 = document.createElement("source");
-
-			videoEl.src = "./images/PanoViewer/invalid.mp4";
-			sourceEl1.src = "./images/PanoViewer/pano.mp4";
-			sourceEl2.src = "./images/PanoViewer/pano.mp4";
-			videoEl.appendChild(sourceEl1);
-			videoEl.appendChild(sourceEl2);
-			videoEl.load();
-
-			this.inst = new VideoLoader(videoEl);
-
-			expect(this.inst).to.be.exist;
-
-			// Then
-			return this.inst.get()
-				.then(() => false, () => true);
-		});
-
-
 		it("should fails when url is invalid#1", function() {
 			this.inst = new VideoLoader("https://invalidurl.png");
 

diff --git a/test/unit/PanoViewer/PanoViewer.spec.js b/test/unit/PanoViewer/PanoViewer.spec.js
@@ -81,6 +81,41 @@ describe("PanoViewer", function() {
 			expect(panoViewer.getVideo()).to.be.null;
 		});
 
+		IT("should work with video", function(done) {
+			// given
+			var videlEl = document.createElement("video");
+			videlEl.setAttribute("src", "./images/PanoViewer/pano.mp4");
+			var readyTriggered = false;
+
+			// when
+			panoViewer = new PanoViewer(target, {
+				video: videlEl
+			}).on("ready", function() {
+				readyTriggered = true;
+				// then			
+				expect(readyTriggered).to.be.true;
+				done();
+			});
+
+		});
+
+		IT("should work with video when src defined after initiate PanoViewer", function(done) {
+			// given
+			var videlEl = document.createElement("video");
+			var readyTriggered = false;
+			panoViewer = new PanoViewer(target, {
+				video: videlEl
+			}).on("ready", function() {
+				readyTriggered = true;
+				// then			
+				expect(readyTriggered).to.be.true;
+				done();
+			});
+
+			// when
+			videlEl.setAttribute("src", "./images/PanoViewer/pano.mp4");
+		});
+
 		IT("should config cubemap layout", done => {
 			// Given
 			var MockedPanoViewer = PanoViewerInjector(