Merge pull request mediaelement#356 from tantalic/138ad82501292d7a2dc…

…72c8b0c46513399507c94 Option for markup between current time and duration
xtat · Jan 11, 2012 · 837bde0 · 837bde0
2 parents 38611b9 + 138ad82
commit 837bde0
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/build/mediaelement-and-player.js b/build/mediaelement-and-player.js
@@ -2783,7 +2783,8 @@ if (typeof jQuery != 'undefined') {
 
 	// options
 	$.extend(mejs.MepDefaults, {
-		duration: -1
+		duration: -1,
+		timeAndDurationSeparator: ' <span> | </span> '
 	});
 
 
@@ -2810,7 +2811,7 @@ if (typeof jQuery != 'undefined') {
 			var t = this;
 
 			if (controls.children().last().find('.mejs-currenttime').length > 0) {
-				$(' <span> | </span> '+
+				$(t.options.timeAndDurationSeparator +
 					'<span class="mejs-duration">' + 
 						(t.options.duration > 0 ? 
 							mejs.Utility.secondsToTimeCode(t.options.duration, t.options.alwaysShowHours || t.media.duration > 3600, t.options.showTimecodeFrameCount,  t.options.framesPerSecond || 25) :

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
@@ -1298,7 +1298,8 @@ if (typeof jQuery != 'undefined') {
 
 	// options
 	$.extend(mejs.MepDefaults, {
-		duration: -1
+		duration: -1,
+		timeAndDurationSeparator: ' <span> | </span> '
 	});
 
 
@@ -1325,7 +1326,7 @@ if (typeof jQuery != 'undefined') {
 			var t = this;
 
 			if (controls.children().last().find('.mejs-currenttime').length > 0) {
-				$(' <span> | </span> '+
+				$(t.options.timeAndDurationSeparator +
 					'<span class="mejs-duration">' + 
 						(t.options.duration > 0 ? 
 							mejs.Utility.secondsToTimeCode(t.options.duration, t.options.alwaysShowHours || t.media.duration > 3600, t.options.showTimecodeFrameCount,  t.options.framesPerSecond || 25) :

diff --git a/build/mediaelementplayer.min.js b/build/mediaelementplayer.min.js
diff --git a/src/js/mep-feature-time.js b/src/js/mep-feature-time.js
@@ -2,7 +2,8 @@
 
 	// options
 	$.extend(mejs.MepDefaults, {
-		duration: -1
+		duration: -1,
+		timeAndDurationSeparator: ' <span> | </span> '
 	});
 
 
@@ -29,7 +30,7 @@
 			var t = this;
 
 			if (controls.children().last().find('.mejs-currenttime').length > 0) {
-				$(' <span> | </span> '+
+				$(t.options.timeAndDurationSeparator +
 					'<span class="mejs-duration">' + 
 						(t.options.duration > 0 ? 
 							mejs.Utility.secondsToTimeCode(t.options.duration, t.options.alwaysShowHours || t.media.duration > 3600, t.options.showTimecodeFrameCount,  t.options.framesPerSecond || 25) :