Release 4.8.1

CHANGELOG.md

@@ -2,15 +2,18 @@ CHANGELOG
 =========
 
 ## HEAD (Unreleased)
+_(none)_
+
+--------------------
+
+## 4.8.1 (2014-09-05)
 * @dmlap fixed an issue where an error could be fired after player disposal ([view](https://github.com/videojs/video.js/pull/1481))
 * @dmlap fixed poster error handling ([view](https://github.com/videojs/video.js/pull/1482))
 * @dmlap fixed an issue with languages and subclassing the player ([view](https://github.com/videojs/video.js/pull/1483))
 * @mmcc fixed a few CSS issues with the poster and the error 'X' ([view](https://github.com/videojs/video.js/pull/1487))
 * @MrVaykadji and @Calinou added a french translation ([view](https://github.com/videojs/video.js/pull/1467))
 * @heff fixed an internal deprecation warning and missing deprecated functions ([view](https://github.com/videojs/video.js/pull/1488))
 
---------------------
-
 ## 4.8.0 (2014-09-03)
 * @andekande added a German translation ([view](https://github.com/videojs/video.js/pull/1426))
 * @mattosborn fixed a bug where getting the video element src would overwrite it ([view](https://github.com/videojs/video.js/pull/1430))

bower.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "main": [
     "dist/video-js/video.js",
     "dist/video-js/video-js.css"

component.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "4.8.0",
+  "version": "4.8.1",
   "keywords": [
     "videojs",
     "html5",

dist/video-js/lang/fr.js

@@ -0,0 +1,26 @@
+videojs.addLanguage("fr",{
+ "Play": "Jouer",
+ "Pause": "Pause",
+ "Current Time": "Actuel",
+ "Duration Time": "Durée",
+ "Remaining Time": "Restant",
+ "Stream Type": "Type de flux",
+ "LIVE": "LIVE",
+ "Loaded": "Chargé",
+ "Progress": "Progression",
+ "Fullscreen": "Plein écran",
+ "Non-Fullscreen": "Fenêtré",
+ "Mute": "Couper le son",
+ "Unmuted": "Rétablir le son",
+ "Playback Rate": "Vitesse de lecture",
+ "Subtitles": "Sous-titres",
+ "subtitles off": "Désactiver",
+ "Captions": "Annotations",
+ "captions off": "Désactiver",
+ "Chapters": "Chapitres",
+ "You aborted the video playback": "Vous avez interrompu la lecture de la vidéo.",
+ "A network error caused the video download to fail part-way.": "Une erreur réseau a fait échouer le téléchargement.",
+ "The video could not be loaded, either because the server or network failed or because the format is not supported.": "La vidéo n'a pas pu être chargée, soit parce que le serveur ou le réseau ont rencontré une erreur, soit parce que le format n'est pas supporté.",
+ "The video playback was aborted due to a corruption problem or because the video used features your browser did not support.": "La lecture a été interrompue à cause d'un problème de corruption ou parce que la vidéo requiert une fonctionnalité non supportée par votre navigateur.",
+ "No compatible source was found for this video.": "Aucune source compatible n'a pu être trouvée pour cette vidéo."
+});

dist/video-js/video-js.css

@@ -1,6 +1,6 @@
 /*!
 Video.js Default Styles (http://videojs.com)
-Version 4.8.0
+Version 4.8.1
 Create your own skin at http://designer.videojs.com
 */
 /* SKIN
@@ -536,17 +536,21 @@ easily in the skin designer. http://designer.videojs.com/
   text-align: center /* Needed for IE8 */;
   vertical-align: middle;
   position: absolute;
+  left: 0;
   top: 50%;
   margin-top: -0.5em;
   width: 100%;
 }
 .vjs-error-display div {
   position: absolute;
+  bottom: 1em;
+  right: 0;
+  left: 0;
   font-size: 1.4em;
   text-align: center;
-  bottom: 1em;
-  right: 1em;
-  left: 1em;
+  padding: 3px;
+  background: #000000;
+  background: rgba(0, 0, 0, 0.5);
 }
 .vjs-error-display a,
 .vjs-error-display a:visited {
@@ -836,11 +840,13 @@ body.vjs-full-window {
   background-position: 50% 50%;
   background-size: contain;
   cursor: pointer;
-  height: 100%;
   margin: 0;
   padding: 0;
-  position: relative;
-  width: 100%;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
 }
 .vjs-poster img {
   display: block;

dist/video-js/video-js.less

@@ -614,19 +614,23 @@ easily in the skin designer. http://designer.videojs.com/
   vertical-align: middle;
 
   position: absolute;
+  left: 0;
   top: 50%;
   margin-top: -0.5em;
   width: 100%;
 }
 
 .vjs-error-display div {
   position: absolute;
+  bottom: 1em;
+  right: 0;
+  left: 0;
 
   font-size: 1.4em;
   text-align: center;
-  bottom: 1em;
-  right: 1em;
-  left: 1em;
+  padding: 3px;
+  background: rgb(0, 0, 0); // fallback to just black
+  background: rgba(0,0,0,0.5); // Normally show black at 50% opacity
 }
 
 .vjs-error-display a, .vjs-error-display a:visited {
@@ -890,11 +894,13 @@ body.vjs-full-window {
   background-position: 50% 50%;
   background-size: contain;
   cursor: pointer;
-  height: 100%;
   margin: 0;
   padding: 0;
-  position: relative;
-  width: 100%;
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
 }
 .vjs-poster img {
   display: block;

dist/video-js/video.dev.js

@@ -4437,7 +4437,8 @@ vjs.Player.prototype.src = function(source){
  * @private
  */
 vjs.Player.prototype.sourceList_ = function(sources){
-  var sourceTech = this.selectSource(sources);
+  var sourceTech = this.selectSource(sources),
+      errorTimeout;
 
   if (sourceTech) {
     if (sourceTech.tech === this.techName) {
@@ -4449,13 +4450,17 @@ vjs.Player.prototype.sourceList_ = function(sources){
     }
   } else {
     // We need to wrap this in a timeout to give folks a chance to add error event handlers
-    setTimeout(vjs.bind(this, function() {
+    errorTimeout = setTimeout(vjs.bind(this, function() {
       this.error({ code: 4, message: this.localize(this.options()['notSupportedMessage']) });
     }), 0);
 
     // we could not find an appropriate tech, but let's still notify the delegate that this is it
     // this needs a better comment about why this is needed
     this.triggerReady();
+
+    this.on('dispose', function() {
+      clearTimeout(errorTimeout);
+    });
   }
 };
 
@@ -6305,9 +6310,11 @@ vjs.Html5.prototype.setupTriggers = function(){
 };
 
 vjs.Html5.prototype.eventHandler = function(evt){
-  // In the case of an error, set the error prop on the player
-  // and let the player handle triggering the event.
-  if (evt.type == 'error') {
+  // In the case of an error on the video element, set the error prop
+  // on the player and let the player handle triggering the event. On
+  // some platforms, error events fire that do not cause the error
+  // property on the video element to be set. See #1465 for an example.
+  if (evt.type == 'error' && this.error()) {
     this.player().error(this.error().code);
 
   // in some cases we pass the event directly to the player
@@ -7357,7 +7364,7 @@ vjs.TextTrack.prototype.mode = function(){
  * and restore it to its normal size when not in fullscreen mode.
  */
 vjs.TextTrack.prototype.adjustFontSize = function(){
-    if (this.player_.isFullScreen()) {
+    if (this.player_.isFullscreen()) {
         // Scale the font by the same factor as increasing the video width to the full screen window width.
         // Additionally, multiply that factor by 1.4, which is the default font size for
         // the caption track (from the CSS)