Merge pull request #55 from Selz/develop

Seek improvements

3 files changed, 348 insertions, 238 deletions

diff --git a/src/js/plyr.js b/src/js/plyr.js
index f91985ae..b16eb021 100644
--- a/src/js/plyr.js
+++ b/src/js/plyr.js
@@ -24,6 +24,7 @@
             container:          ".player",
             controls:           ".player-controls",
             buttons: {
+                seek:           "[data-player='seek']",
                 play:           "[data-player='play']",
                 pause:          "[data-player='pause']",
                 restart:        "[data-player='restart']",
@@ -40,8 +41,7 @@
                 played:         ".player-progress-played"
             },
             captions:           ".player-captions",
-            duration:           ".player-duration",
-            seekTime:           ".player-seek-time"
+            duration:           ".player-duration"
         },
         classes: {
             video:              "player-video",
@@ -70,64 +70,68 @@
             enabled:            true
         },
         html: (function() {
-                return ["<div class='player-controls'>",
-                "<div class='player-progress'>",
-                    "<progress class='player-progress-played' max='100' value='0'>",
-                        "<span>0</span>% played",
-                    "</progress>",
-                    "<progress class='player-progress-buffer' max='100' value='0'>",
-                        "<span>0</span>% buffered",
-                    "</progress>",
-                "</div>",
-                "<span class='player-controls-playback'>",
-                    "<button type='button' data-player='restart'>",
-                        "<svg><use xlink:href='#icon-restart'></use></svg>",
-                        "<span class='sr-only'>Restart</span>",
-                    "</button>",
-                    "<button type='button' data-player='rewind'>",
-                        "<svg><use xlink:href='#icon-rewind'></use></svg>",
-                        "<span class='sr-only'>Rewind <span class='player-seek-time'>{seektime}</span> seconds</span>",
-                    "</button>",
-                    "<button type='button' data-player='play'>",
-                        "<svg><use xlink:href='#icon-play'></use></svg>",
-                        "<span class='sr-only'>Play</span>",
-                    "</button>",
-                    "<button type='button' data-player='pause'>",
-                        "<svg><use xlink:href='#icon-pause'></use></svg>",
-                        "<span class='sr-only'>Pause</span>",
-                    "</button>",
-                    "<button type='button' data-player='fast-forward'>",
-                        "<svg><use xlink:href='#icon-fast-forward'></use></svg>",
-                        "<span class='sr-only'>Fast forward <span class='player-seek-time'>{seektime}</span> seconds</span>",
-                    "</button>",
-                    "<span class='player-time'>",
-                        "<span class='sr-only'>Time</span>",
-                        "<span class='player-duration'>00:00</span>",
+            return [
+                "<div class='player-controls'>",
+                    "<div class='player-progress'>",
+                        "<label for='seek{id}' class='sr-only'>Seek</label>",
+                        "<input id='seek{id}' class='player-progress-seek' type='range' min='0' max='100' step='0.5' value='0' data-player='seek'>",
+                        "<progress class='player-progress-played' max='100' value='0'>",
+                            "<span>0</span>% played",
+                        "</progress>",
+                        "<progress class='player-progress-buffer' max='100' value='0'>",
+                            "<span>0</span>% buffered",
+                        "</progress>",
+                    "</div>",
+                    "<span class='player-controls-playback'>",
+                        "<button type='button' data-player='restart'>",
+                            "<svg><use xlink:href='#icon-restart'></use></svg>",
+                            "<span class='sr-only'>Restart</span>",
+                        "</button>",
+                        "<button type='button' data-player='rewind'>",
+                            "<svg><use xlink:href='#icon-rewind'></use></svg>",
+                            "<span class='sr-only'>Rewind {seektime} seconds</span>",
+                        "</button>",
+                        "<button type='button' data-player='play'>",
+                            "<svg><use xlink:href='#icon-play'></use></svg>",
+                            "<span class='sr-only'>Play</span>",
+                        "</button>",
+                        "<button type='button' data-player='pause'>",
+                            "<svg><use xlink:href='#icon-pause'></use></svg>",
+                            "<span class='sr-only'>Pause</span>",
+                        "</button>",
+                        "<button type='button' data-player='fast-forward'>",
+                            "<svg><use xlink:href='#icon-fast-forward'></use></svg>",
+                            "<span class='sr-only'>Fast forward {seektime} seconds</span>",
+                        "</button>",
+                        "<span class='player-time'>",
+                            "<span class='sr-only'>Time</span>",
+                            "<span class='player-duration'>00:00</span>",
+                        "</span>",
                     "</span>",
-                "</span>",
-                "<span class='player-controls-sound'>",
-                    "<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>",
-                    "<label id='mute{id}' for='mute{id}'>",
-                        "<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>",
-                        "<svg><use xlink:href='#icon-volume'></use></svg>",
-                        "<span class='sr-only'>Toggle Mute</span>",
-                    "</label>",
-                    "<label for='volume{id}' class='sr-only'>Volume</label>",
-                    "<input id='volume{id}' class='player-volume' type='range' min='0' max='10' value='5' data-player='volume'>",
-                    "<input class='sr-only' id='captions{id}' type='checkbox' data-player='captions'>",
-                    "<label for='captions{id}'>",
-                        "<svg class='icon-captions-on'><use xlink:href='#icon-captions-on'></use></svg>",
-                        "<svg><use xlink:href='#icon-captions-off'></use></svg>",
-                        "<span class='sr-only'>Toggle Captions</span>",
-                    "</label>",
-                    "<button type='button' data-player='fullscreen'>",
-                        "<svg class='icon-exit-fullscreen'><use xlink:href='#icon-exit-fullscreen'></use></svg>",
-                        "<svg><use xlink:href='#icon-enter-fullscreen'></use></svg>",
-                        "<span class='sr-only'>Toggle fullscreen</span>",
-                    "</button>",
-                "</span>",
-            "</div>"].join("\n");
-        })()
+                    "<span class='player-controls-sound'>",
+                        "<input class='inverted sr-only' id='mute{id}' type='checkbox' data-player='mute'>",
+                        "<label id='mute{id}' for='mute{id}'>",
+                            "<svg class='icon-muted'><use xlink:href='#icon-muted'></use></svg>",
+                            "<svg><use xlink:href='#icon-volume'></use></svg>",
+                            "<span class='sr-only'>Toggle Mute</span>",
+                        "</label>",
+                        "<label for='volume{id}' class='sr-only'>Volume</label>",
+                        "<input id='volume{id}' class='player-volume' type='range' min='0' max='10' value='5' data-player='volume'>",
+                        "<input class='sr-only' id='captions{id}' type='checkbox' data-player='captions'>",
+                        "<label for='captions{id}'>",
+                            "<svg class='icon-captions-on'><use xlink:href='#icon-captions-on'></use></svg>",
+                            "<svg><use xlink:href='#icon-captions-off'></use></svg>",
+                            "<span class='sr-only'>Toggle Captions</span>",
+                        "</label>",
+                        "<button type='button' data-player='fullscreen'>",
+                            "<svg class='icon-exit-fullscreen'><use xlink:href='#icon-exit-fullscreen'></use></svg>",
+                            "<svg><use xlink:href='#icon-enter-fullscreen'></use></svg>",
+                            "<span class='sr-only'>Toggle fullscreen</span>",
+                        "</button>",
+                    "</span>",
+                "</div>"
+            ].join("\n");
+    })()
     };
 
     // Debugging
@@ -272,34 +276,7 @@
 
     // Get percentage
     function _getPercentage(current, max) {
-        return Math.floor((current / max) * 100);
-    }
-
-    // Get click position relative to parent
-    // http://www.kirupa.com/html5/getting_mouse_click_position.htm
-    function _getClickPosition(event) {
-        var parentPosition = _fullscreen().isFullScreen() ? { x: 0, y: 0 } : _getPosition(event.currentTarget);
-
-        return {
-            x: event.clientX - parentPosition.x,
-            y: event.clientY - parentPosition.y
-        };
-    }
-    // Get element position
-    function _getPosition(element) {
-        var xPosition = 0;
-        var yPosition = 0;
-
-        while (element) {
-            xPosition += (element.offsetLeft - element.scrollLeft + element.clientLeft);
-            yPosition += (element.offsetTop - element.scrollTop + element.clientTop);
-            element = element.offsetParent;
-        }
-        
-        return { 
-            x: xPosition, 
-            y: yPosition 
-        };
+        return ((current / max) * 100).toFixed(2);
     }
 
     // Deep extend/merge two Objects
@@ -509,6 +486,7 @@
 
                 // Buttons
                 player.buttons = {};
+                player.buttons.seek             = _getElement(config.selectors.buttons.seek);
                 player.buttons.play             = _getElement(config.selectors.buttons.play);
                 player.buttons.pause            = _getElement(config.selectors.buttons.pause);
                 player.buttons.restart          = _getElement(config.selectors.buttons.restart);
@@ -757,13 +735,6 @@
             }
         }
 
-        // Setup seeking
-        function _setupSeeking() {
-            // Update number of seconds in rewind and fast forward buttons
-            player.seekTime[0].innerHTML = config.seekTime;
-            player.seekTime[1].innerHTML = config.seekTime;
-        }
-
         // Setup fullscreen
         function _setupFullscreen() {
             if(player.type === "video" && config.fullscreen.enabled) {
@@ -812,19 +783,7 @@
             if(typeof seekTime !== "number") {
                 seekTime = config.seekTime;
             }
-
-            var targetTime = player.media.currentTime - seekTime;
-
-            if (targetTime < 0) {
-                player.media.currentTime = 0;
-            }
-            else {
-                player.media.currentTime = targetTime;
-            }
-            // Special handling for "manual" captions
-            if (!player.isTextTracks && player.type === "video") {
-                _adjustManualCaptions(player);
-            }
+            _seek(player.media.currentTime - seekTime);
         }
 
         // Fast forward
@@ -833,15 +792,35 @@
             if(typeof seekTime !== "number") {
                 seekTime = config.seekTime;
             }
+            _seek(player.media.currentTime + seekTime);
+        }
 
-            var targetTime = player.media.currentTime + seekTime;
+        // Seek to time
+        var _seek = function(input) {
+            //var value = config.seekTime;
+            var targetTime = 0;
 
-            if (targetTime > player.media.duration) {
-                player.media.currentTime = player.media.duration;
+            // If no event or time is passed, bail
+            if (typeof input === "undefined") {
+                return;
             }
-            else {
-                player.media.currentTime = targetTime;
+            // Explicit position
+            else if (typeof input === "number") {
+                targetTime = input;
             }
+            // Event
+            else if (input.type === "change" || input.type === "input") {
+                // It's the seek slider
+                // Seek to the selected time
+                targetTime = ((this.value / this.max) * player.media.duration).toFixed(1);
+            }
+
+            // Set the current time
+            player.media.currentTime = targetTime;
+
+            // Logging
+            _log("Seeking to " + player.media.currentTime + " seconds");
+
             // Special handling for "manual" captions
             if (!player.isTextTracks && player.type === "video") {
                 _adjustManualCaptions(player);
@@ -970,11 +949,27 @@
             switch(event.type) {
                 // Video playing
                 case "timeupdate":
+                case "seeking":
                     progress    = player.progress.played.bar;
                     text        = player.progress.played.text;
                     value       = _getPercentage(player.media.currentTime, player.media.duration);
+
+                    // Set seek range value only if it's a "natural" time event
+                    if(event.type == "timeupdate") {
+                        player.buttons.seek.value = value;
+                    }
+                    
                     break;
 
+                // Events from seek range
+                case "change":
+                case "input":
+                    progress    = player.progress.played.bar;
+                    text        = player.progress.played.text;
+                    value       = event.target.value;
+                    break;
+
+
                 // Check buffer status
                 case "playing":
                 case "progress":
@@ -996,6 +991,8 @@
                 progress.value = value;
                 text.innerHTML = value;
             }
+
+            //_log(event);
         }
 
         // Update the displayed play time
@@ -1011,6 +1008,13 @@
             player.duration.innerHTML = player.mins + ":" + player.secs;
         }
 
+        function _timeUpdate(event) {
+            // Duration
+            _updateTimeDisplay();
+            // Playing progress
+            _updateProgress(event);
+        }
+
         // Listen for events
         function _listeners() {
             // Play
@@ -1066,22 +1070,11 @@
                 });
             }
             
-            // Duration
-            _on(player.media, "timeupdate", _updateTimeDisplay);
+            // Time change on media
+            _on(player.media, "timeupdate seeking", _timeUpdate);
 
-            // Playing progress
-            _on(player.media, "timeupdate", _updateProgress);
-
-            // Skip when clicking progress bar
-            _on(player.progress.played.bar, "click", function(event) {
-                player.pos = _getClickPosition(event).x / this.offsetWidth;
-                player.media.currentTime = player.pos * player.media.duration;
-                
-                // Special handling for "manual" captions
-                if (!player.isTextTracks && player.type === "video") {
-                    _adjustManualCaptions(player);
-                }
-            });
+            // Seek 
+            _on(player.buttons.seek, "change input", _seek);
 
             // Captions
             _on(player.buttons.captions, "click", function() { 
@@ -1154,9 +1147,6 @@
             // Setup fullscreen
             _setupFullscreen();
 
-            // Seeking
-            _setupSeeking();
-
             // Listeners
             _listeners();
         }
@@ -1170,6 +1160,7 @@
             restart:            _restart,
             rewind:             _rewind,
             forward:            _forward,
+            seek:               _seek,
             setVolume:          _setVolume,
             toggleMute:         _toggleMute,
             toggleCaptions:     _toggleCaptions
diff --git a/src/less/plyr.less b/src/less/plyr.less
index 9a53715b..b72f0ec7 100644
--- a/src/less/plyr.less
+++ b/src/less/plyr.less
@@ -21,7 +21,6 @@
 @control-bg-hover: 			@blue;
 @control-color: 			@gray-light;
 @control-color-inactive: 	@gray;
-@control-color-focus: 		#fff;
 @control-color-hover: 		#fff;
 
 // Progress
@@ -29,13 +28,13 @@
 @progress-playing-bg: 		@blue;
 @progress-buffered-bg: 		@gray;
 
-// Range
-@range-track-height: 		6px;
-@range-track-bg: 			@gray;
-@range-thumb-height: 		(@range-track-height * 2);
-@range-thumb-width: 		(@range-track-height * 2);
-@range-thumb-bg: 			@control-color;
-@range-thumb-bg-focus: 		@control-bg-hover;
+// Volume
+@volume-track-height: 		6px;
+@volume-track-bg: 			@gray;
+@volume-thumb-height: 		(@volume-track-height * 2);
+@volume-thumb-width: 		(@volume-track-height * 2);
+@volume-thumb-bg: 			@control-color;
+@volume-thumb-bg-focus: 	@control-bg-hover;
 
 // Breakpoints
 @bp-control-split: 			560px; // When controls split into left/right
@@ -64,25 +63,35 @@
 // Tab focus styles
 .tab-focus() {
 	outline: thin dotted #000;
-	outline-offset: 1px;
+	outline-offset: 0;
 }
 
-// Range styling
+// <input type="range"> styling
 // ---------------------------------------
-.range-thumb() {
-	height: @range-thumb-height;
-	width: @range-thumb-width;
-	background: @range-thumb-bg;
+.volume-thumb() {
+	height: @volume-thumb-height;
+	width: @volume-thumb-width;
+	background: @volume-thumb-bg;
 	border: 0;
-	border-radius: (@range-thumb-height / 2);
+	border-radius: (@volume-thumb-height / 2);
 	transition: background .3s ease;
 	cursor: ew-resize;
 }
-.range-track() {
-	height: @range-track-height;
-	background: @range-track-bg;
+.volume-track() {
+	height: @volume-track-height;
+	background: @volume-track-bg;
+	border: 0;
+	border-radius: (@volume-track-height / 2);
+}
+.seek-thumb() {
+	background: transparent;
+	border: 0;
+	width: 2px;
+	height: @control-spacing;
+}
+.seek-track() {
+	background: none;
 	border: 0;
-	border-radius: (@range-track-height / 2);
 }
 
 // Font smoothing
@@ -196,13 +205,13 @@
 				transition: fill .3s ease;
 			}
 		}
-		[type="checkbox"] + label,
+		input + label,
 		.inverted:checked + label {
 			color: @control-color-inactive;
 		}
 		button, 
 		.inverted + label,
-		[type="checkbox"]:checked + label {
+		input:checked + label {
 			color: @control-color;
 		}
 		button {
@@ -210,16 +219,18 @@
 			background: transparent;
 			overflow: hidden;
 		}
-		[type="checkbox"]:focus + label,
-		button:focus {
-			.tab-focus();
-			color: @control-color-focus;
-		}
+		
+		button:focus,
 		button:hover,
-		[type="checkbox"] + label:hover {
+		input:focus + label,
+		input + label:hover {
 			background: @control-bg-hover;
 			color: @control-color-hover;
 		}
+		button:focus,
+		input:focus + label {
+			outline: 0;
+		}
 		.icon-exit-fullscreen,
 		.icon-muted,
 		.icon-captions-on {
@@ -247,44 +258,93 @@
 		height: @control-spacing;
 		background: @progress-bg;
 
-		&-buffer,
-		&-played {
+		&-buffer[value],
+		&-played[value],
+		&-seek[type=range] {
 			position: absolute;
 			left: 0;
 			top: 0;
 			width: 100%;
-			height: 100%;
+			height: @control-spacing;
 			margin: 0;
+			padding: 0;
 			vertical-align: top;
-			
-			&[value] {
-				-webkit-appearance: none;
-				border: none;
-				background: transparent;
 
-				&::-webkit-progress-bar {
-					background: transparent;
-				}
+			-webkit-appearance: none;
+			-moz-appearance: none;
+			border: none;
+			background: transparent;
+		}
+		&-buffer[value],
+		&-played[value] {	
+			&::-webkit-progress-bar {
+				background: transparent;
+			}
 
-				// Inherit from currentColor;
-				&::-webkit-progress-value {
-					background: currentColor;
-				}
-				&::-moz-progress-bar {
-					background: currentColor;
-				}
+			// Inherit from currentColor;
+			&::-webkit-progress-value {
+				background: currentColor;
+				transition: width .1s ease;
+			}
+			&::-moz-progress-bar {
+				background: currentColor;
+				transition: width .1s ease;
 			}
-		}
-		&-played {
-			z-index: 2;
 		}
 		&-played[value] {
-			cursor: pointer;
+			z-index: 2;
 			color: @progress-playing-bg;
 		}
 		&-buffer[value] {
 			color: @progress-buffered-bg;
 		}
+
+		// Seek control
+		// <input[type='range']> element
+		// Specificity is for bootstrap compatibility
+		&-seek[type=range] {
+			z-index: 3;
+			cursor: pointer;
+			outline: 0;
+
+			// Webkit
+			&::-webkit-slider-runnable-track {
+				.seek-track();
+			}
+			&::-webkit-slider-thumb {
+				-webkit-appearance: none;
+				.seek-thumb();
+			}
+
+			// Mozilla
+			&::-moz-range-track {
+				.seek-track();
+			}
+			&::-moz-range-thumb {
+				-moz-appearance: none;
+				.seek-thumb();
+			}
+			
+			// Microsoft
+			&::-ms-track {
+				color: transparent;
+				.seek-track();
+			}
+			&::-ms-fill-lower,
+			&::-ms-fill-upper {
+				.seek-track();
+			}
+			&::-ms-thumb {
+				.seek-thumb();
+			}
+
+			&:focus {
+				outline: 0;
+			}
+			&::-moz-focus-outer {
+				border: 0;
+			}
+		}
 	}
 
 	// States
@@ -312,49 +372,49 @@
 		
 		// Webkit
 		&::-webkit-slider-runnable-track {
-			.range-track();
+			.volume-track();
 		}
 		&::-webkit-slider-thumb {
 			-webkit-appearance: none;
-			margin-top: -((@range-thumb-height - @range-track-height) / 2);
-			.range-thumb();
+			margin-top: -((@volume-thumb-height - @volume-track-height) / 2);
+			.volume-thumb();
 		}
 
 		// Mozilla
 		&::-moz-range-track {
-			.range-track();
+			.volume-track();
 		}
 		&::-moz-range-thumb {
-			.range-thumb();
+			.volume-thumb();
 		}
 		
 		// Microsoft
 		&::-ms-track {
-			height: @range-track-height;
+			height: @volume-track-height;
 			background: transparent;
 			border-color: transparent;
-			border-width: ((@range-thumb-height - @range-track-height) / 2) 0;
+			border-width: ((@volume-thumb-height - @volume-track-height) / 2) 0;
 			color: transparent;
 		}
 		&::-ms-fill-lower,
 		&::-ms-fill-upper {
-			.range-track();
+			.volume-track();
 		}
 		&::-ms-thumb {
-			.range-thumb();
+			.volume-thumb();
 		}
 
 		&:focus {
 			outline: 0;
 
 			&::-webkit-slider-thumb {
-				background: @range-thumb-bg-focus;
+				background: @volume-thumb-bg-focus;
 			}
 			&::-moz-range-thumb {
-				background: @range-thumb-bg-focus;
+				background: @volume-thumb-bg-focus;
 			}
 			&::-ms-thumb {
-				background: @range-thumb-bg-focus;
+				background: @volume-thumb-bg-focus;
 			}
 		}
 	}
diff --git a/src/sass/plyr.scss b/src/sass/plyr.scss
index 51eae73d..34ab288f 100644
--- a/src/sass/plyr.scss
+++ b/src/sass/plyr.scss
@@ -30,12 +30,12 @@ $progress-playing-bg: 		$blue;
 $progress-buffered-bg: 		$gray;
 
 // Range
-$range-track-height: 		6px;
-$range-track-bg: 			$gray;
-$range-thumb-height: 		($range-track-height * 2);
-$range-thumb-width: 		($range-track-height * 2);
-$range-thumb-bg: 			$control-color;
-$range-thumb-bg-focus: 		$control-bg-hover;
+$volume-track-height: 		6px;
+$volume-track-bg: 			$gray;
+$volume-thumb-height: 		($volume-track-height * 2);
+$volume-thumb-width: 		($volume-track-height * 2);
+$volume-thumb-bg: 			$control-color;
+$volume-thumb-bg-focus: 	$control-bg-hover;
 
 // Breakpoints
 $bp-control-split: 			560px; // When controls split into left/right
@@ -66,27 +66,37 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 @mixin tab-focus()
 {
 	outline: thin dotted #000;
-	outline-offset: 1px;
+	outline-offset: 0;
 }
 
-// Range styling
+// <input type="range"> styling
 // ---------------------------------------
-@mixin range-thumb()
+@mixin volume-thumb()
 {
-	height: $range-thumb-height;
-	width: $range-thumb-width;
-	background: $range-thumb-bg;
+	height: $volume-thumb-height;
+	width: $volume-thumb-width;
+	background: $volume-thumb-bg;
 	border: 0;
-	border-radius: ($range-thumb-height / 2);
+	border-radius: ($volume-thumb-height / 2);
 	transition: background .3s ease;
 	cursor: ew-resize;
 }
-@mixin range-track()
+@mixin volume-track()
 {
-	height: $range-track-height;
-	background: $range-track-bg;
+	height: $volume-track-height;
+	background: $volume-track-bg;
+	border: 0;
+	border-radius: ($volume-track-height / 2);
+}
+@mixin seek-thumb() {
+	background: transparent;
+	border: 0;
+	width: 2px;
+	height: $control-spacing;
+}
+@mixin seek-track() {
+	background: none;
 	border: 0;
-	border-radius: ($range-track-height / 2);
 }
 
 // Font smoothing
@@ -202,13 +212,13 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 				transition: fill .3s ease;
 			}
 		}
-		[type="checkbox"] + label,
+		input + label,
 		.inverted:checked + label {
 			color: $control-color-inactive;
 		}
 		button,
 		.inverted + label,
-		[type="checkbox"]:checked + label {
+		input:checked + label {
 			color: $control-color;
 		}
 		button {
@@ -216,13 +226,13 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 			background: transparent;
 			overflow: hidden;
 		}
-		[type="checkbox"]:focus + label,
+		input:focus + label,
 		button:focus {
 			@include tab-focus();
 			color: $control-color-focus;
 		}
 		button:hover,
-		[type="checkbox"] + label:hover {
+		input + label:hover {
 			background: $control-bg-hover;
 			color: $control-color-hover;
 		}
@@ -253,8 +263,9 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 		height: $control-spacing;
 		background: $progress-bg;
 
-		&-buffer,
-		&-played {
+		&-buffer[value],
+		&-played[value],
+		&-seek[type=range] {
 			position: absolute;
 			left: 0;
 			top: 0;
@@ -263,34 +274,82 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 			margin: 0;
 			vertical-align: top;
 
-			&[value] {
-				-webkit-appearance: none;
-				border: none;
-				background: transparent;
+			-webkit-appearance: none;
+			-moz-appearance: none;
+			border: none;
+			background: transparent;
+		}
 
-				&::-webkit-progress-bar {
-					background: transparent;
-				}
+		&-buffer[value],
+		&-played[value] {	
+			&::-webkit-progress-bar {
+				background: transparent;
+			}
 
-				// Inherit from currentColor;
-				&::-webkit-progress-value {
-					background: currentColor;
-				}
-				&::-moz-progress-bar {
-					background: currentColor;
-				}
+			// Inherit from currentColor;
+			&::-webkit-progress-value {
+				background: currentColor;
+				transition: width .1s ease;
+			}
+			&::-moz-progress-bar {
+				background: currentColor;
+				transition: width .1s ease;
 			}
-		}
-		&-played {
-			z-index: 2;
 		}
 		&-played[value] {
-			cursor: pointer;
+			z-index: 2;
 			color: $progress-playing-bg;
 		}
 		&-buffer[value] {
 			color: $progress-buffered-bg;
 		}
+
+		// Seek control
+		// <input[type='range']> element
+		// Specificity is for bootstrap compatibility
+		&-seek[type=range] {
+			z-index: 3;
+			cursor: pointer;
+			outline: 0;
+
+			// Webkit
+			&::-webkit-slider-runnable-track {
+				@include seek-track();
+			}
+			&::-webkit-slider-thumb {
+				-webkit-appearance: none;
+				@include seek-thumb();
+			}
+
+			// Mozilla
+			&::-moz-range-track {
+				@include seek-track();
+			}
+			&::-moz-range-thumb {
+				-moz-appearance: none;
+				@include seek-thumb();
+			}
+			
+			// Microsoft
+			&::-ms-track {
+				color: transparent;
+				@include seek-track();
+			}
+			&::-ms-fill-lower,
+			&::-ms-fill-upper {
+				@include seek-track();
+			}
+			&::-ms-thumb {
+				@include seek-thumb();
+			}
+
+			&:focus {
+				outline: 0;
+			}
+			&::-moz-focus-outer {
+				border: 0;
+			}
+		}
 	}
 
 	// States
@@ -321,7 +380,7 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 		}
 		&::-webkit-slider-thumb {
 			-webkit-appearance: none;
-			margin-top: -(($range-thumb-height - $range-track-height) / 2);
+			margin-top: -(($volume-thumb-height - $volume-track-height) / 2);
 			@include range-thumb();
 		}
 
@@ -335,10 +394,10 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 
 		// Microsoft
 		&::-ms-track {
-			height: $range-track-height;
+			height: $volume-track-height;
 			background: transparent;
 			border-color: transparent;
-			border-width: (($range-thumb-height - $range-track-height) / 2) 0;
+			border-width: (($volume-thumb-height - $volume-track-height) / 2) 0;
 			color: transparent;
 		}
 		&::-ms-fill-lower,
@@ -353,13 +412,13 @@ $bp-captions-large: 		768px; // When captions jump to the larger font size
 			outline: 0;
 
 			&::-webkit-slider-thumb {
-				background: $range-thumb-bg-focus;
+				background: $volume-thumb-bg-focus;
 			}
 			&::-moz-range-thumb {
-				background: $range-thumb-bg-focus;
+				background: $volume-thumb-bg-focus;
 			}
 			&::-ms-thumb {
-				background: $range-thumb-bg-focus;
+				background: $volume-thumb-bg-focus;
 			}
 		}
 	}