Added fix for issue described in #1924

mediaelement · Nov 8, 2016 · fef45a7 · fef45a7
1 parent 9759818
commit fef45a7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 6 deletions.
diff --git a/build/mediaelement-and-player.js b/build/mediaelement-and-player.js
@@ -7366,7 +7366,10 @@ if (jQuery !== undefined) {
 		play: function () {
 			var t = this;
 
-			t.load();
+			// only load if the current time is 0 to ensure proper
+			if (t.media.getCurrentTime() <= 0) {
+				t.load();
+			}
 			t.media.play();
 		},
 		pause: function () {

diff --git a/build/mediaelement-and-player.min.js b/build/mediaelement-and-player.min.js
diff --git a/build/mediaelementplayer.js b/build/mediaelementplayer.js
@@ -1547,7 +1547,10 @@ if (jQuery !== undefined) {
 		play: function () {
 			var t = this;
 
-			t.load();
+			// only load if the current time is 0 to ensure proper
+			if (t.media.getCurrentTime() <= 0) {
+				t.load();
+			}
 			t.media.play();
 		},
 		pause: function () {

diff --git a/build/mediaelementplayer.min.js b/build/mediaelementplayer.min.js
diff --git a/src/js/mediaelement-renderer-flv.js b/src/js/mediaelement-renderer-flv.js
@@ -3,6 +3,8 @@
  *
  * Uses flv.js, which is a JavaScript library which implements mechanisms to play flv files inspired by flv.js.
  * It relies on HTML5 video and MediaSource Extensions for playback.
+ * Currently, it can only play files with the same origin.
+ *
  * @see https://github.com/Bilibili/flv.js
  *
  */
@@ -142,6 +144,7 @@
 		canPlayType: function (type) {
 
 			var mediaTypes = ['video/x-flv', 'video/flv'];
+
 			return mejs.MediaFeatures.hasMse && mediaTypes.indexOf(type) > -1;
 		},
 		/**
@@ -162,7 +165,7 @@
 				id = mediaElement.id + '_' + options.prefix,
 				flvPlayer,
 				stack = {}
-				;
+			;
 
 			node = originalNode.cloneNode(true);
 			options = mejs.Utils.extend(options, mediaElement.options);
@@ -273,6 +276,7 @@
 					}
 				}
 			}
+
 			node.className = '';
 
 			originalNode.parentNode.insertBefore(node, originalNode);

diff --git a/src/js/mediaelementplayer-player.js b/src/js/mediaelementplayer-player.js
@@ -1518,7 +1518,10 @@
 		play: function () {
 			var t = this;
 
-			t.load();
+			// only load if the current time is 0 to ensure proper
+			if (t.media.getCurrentTime() <= 0) {
+				t.load();
+			}
 			t.media.play();
 		},
 		pause: function () {