resolved conflicts with upstream master

Gruntfile.js

@@ -95,6 +95,10 @@ module.exports = function(grunt) {
       }
 
       if (results) {
+	var i = results.length;
+	while (i--) {
+          results[i] = results[i].replace(/\\/g, '/');
+	}
         grunt.file.write('build/files/sourcelist.txt', results.join(','));
         grunt.file.write('build/files/sourcelist.js', 'var sourcelist = ["' + results.join('","') + '"]');
 

docs/tracks.md

@@ -13,7 +13,7 @@ Creating the Text File
 ----------------------
 Timed text requires a text file in [WebVTT](http://dev.w3.org/html5/webvtt/) format. This format defines a list of "cues" that have a start time, and end time, and text to display. [Microsoft has a builder](http://ie.microsoft.com/testdrive/Graphics/CaptionMaker/) that can help you get started on the file.
 
-When creating captions, there's also additional (caption formatting techniques)[http://www.theneitherworld.com/mcpoodle/SCC_TOOLS/DOCS/SCC_FORMAT.HTML#style] that would be good to use, like brackets around sound effects. [ sound effect ]
+When creating captions, there's also additional [caption formatting techniques](http://www.theneitherworld.com/mcpoodle/SCC_TOOLS/DOCS/SCC_FORMAT.HTML#style) that would be good to use, like brackets around sound effects. [ sound effect ]
 
 Adding to Video.js
 ------------------
@@ -222,4 +222,4 @@ The two-letter code (valid BCP 47 language tag) for the language of the text tra
       
     </td>
   </tr>
-</table>
+</table>

src/js/controls.js

@@ -812,6 +812,7 @@ vjs.VolumeBar = function(player, options){
   goog.base(this, player, options);
   player.on('volumechange', vjs.bind(this, this.updateARIAAttributes));
   player.ready(vjs.bind(this, this.updateARIAAttributes));
+  setTimeout(vjs.bind(this, this.update), 0); // update when elements is in DOM
 };
 goog.inherits(vjs.VolumeBar, vjs.Slider);
 

src/js/media.html5.js

@@ -65,14 +65,13 @@ vjs.Html5.prototype.createEl = function(){
     // If the original tag is still there, remove it.
     if (el) {
       player.el().removeChild(el);
+      el = el.cloneNode(false);
+    } else {
+      el = vjs.createEl('video', {
+        id:player.id() + '_html5_api',
+        className:'vjs-tech'
+      });
     }
-
-    newEl = vjs.createElement('video', {
-      id: el.id || player.id() + '_html5_api',
-      className: el.className || 'vjs-tech'
-    });
-
-    el = newEl;
     vjs.insertFirst(el, player.el());
   }
 

src/js/player.js

@@ -22,16 +22,16 @@ vjs.Player = function(tag, options, ready){
   // Cache for video property values.
   this.cache_ = {};
 
+  // Set poster
+  this.poster_ = options['poster'];
+  // Set controls
+  this.controls_ = options['controls'];
+
   // Run base component initializing with new options.
   // Builds the element through createEl()
   // Inits and embeds any child components in opts
   vjs.Component.call(this, this, options, ready);
 
-  // Set poster
-  this.poster_ = this.options_['poster'];
-  // Set controls
-  this.controls_ = this.options_['controls'];
-
   // Firstplay event implimentation. Not sold on the event yet.
   // Could probably just check currentTime==0?
   this.one('play', function(e){
@@ -53,6 +53,7 @@ vjs.Player = function(tag, options, ready){
   this.on('progress', this.onProgress);
   this.on('durationchange', this.onDurationChange);
   this.on('error', this.onError);
+  this.on('fullscreenchange', this.onFullscreenChange);
 
   // Make player easily findable by ID
   vjs.players[this.id_] = this;
@@ -387,6 +388,14 @@ vjs.Player.prototype.onError = function(e) {
   vjs.log('Video Error', e);
 };
 
+vjs.Player.prototype.onFullscreenChange = function(e) {
+  if (this.isFullScreen) {
+    this.addClass('vjs-fullscreen');
+  } else {
+    this.removeClass('vjs-fullscreen');
+  }
+};
+
 // /* Player API
 // ================================================================================ */