v5.2.3 dist

CHANGELOG.md

@@ -6,6 +6,9 @@ _(none)_
 
 --------------------
 
+## 5.2.3 (2015-11-24)
+* @gkatsev fixed clearing out errors ([view](https://github.com/videojs/video.js/pull/2850))
+
 ## 5.2.2 (2015-11-23)
 * @DatTran fixed bower paths. Fixes #2740 ([view](https://github.com/videojs/video.js/pull/2775))
 * @nbibler ensured classes begin with alpha characters. Fixes #2828 ([view](https://github.com/videojs/video.js/pull/2829))

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": "5.2.2",
+  "version": "5.2.3",
   "keywords": [
     "videojs",
     "html5",

dist/alt/video.novtt.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.2 <http://videojs.com/>
+ * Video.js 5.2.3 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -11136,6 +11136,7 @@ var Player = (function (_Component) {
     if (err === null) {
       this.error_ = err;
       this.removeClass('vjs-error');
+      this.errorDisplay.close();
       return this;
     }
 
@@ -11146,9 +11147,6 @@ var Player = (function (_Component) {
       this.error_ = new _mediaErrorJs2['default'](err);
     }
 
-    // fire an error event on the player
-    this.trigger('error');
-
     // add the vjs-error classname to the player
     this.addClass('vjs-error');
 
@@ -11156,6 +11154,9 @@ var Player = (function (_Component) {
     // ie8 just logs "[object object]" if you just log the error object
     _utilsLogJs2['default'].error('(CODE:' + this.error_.code + ' ' + _mediaErrorJs2['default'].errorTypes[this.error_.code] + ')', this.error_.message, this.error_);
 
+    // fire an error event on the player
+    this.trigger('error');
+
     return this;
   };
 
@@ -18587,7 +18588,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.2';
+videojs.VERSION = '5.2.3';
 
 /**
  * The global options object. These are the settings that take effect

dist/video.js

@@ -1,6 +1,6 @@
 /**
  * @license
- * Video.js 5.2.2 <http://videojs.com/>
+ * Video.js 5.2.3 <http://videojs.com/>
  * Copyright Brightcove, Inc. <https://www.brightcove.com/>
  * Available under Apache License Version 2.0
  * <https://github.com/videojs/video.js/blob/master/LICENSE>
@@ -11140,6 +11140,7 @@ var Player = (function (_Component) {
     if (err === null) {
       this.error_ = err;
       this.removeClass('vjs-error');
+      this.errorDisplay.close();
       return this;
     }
 
@@ -11150,9 +11151,6 @@ var Player = (function (_Component) {
       this.error_ = new _mediaErrorJs2['default'](err);
     }
 
-    // fire an error event on the player
-    this.trigger('error');
-
     // add the vjs-error classname to the player
     this.addClass('vjs-error');
 
@@ -11160,6 +11158,9 @@ var Player = (function (_Component) {
     // ie8 just logs "[object object]" if you just log the error object
     _utilsLogJs2['default'].error('(CODE:' + this.error_.code + ' ' + _mediaErrorJs2['default'].errorTypes[this.error_.code] + ')', this.error_.message, this.error_);
 
+    // fire an error event on the player
+    this.trigger('error');
+
     return this;
   };
 
@@ -18591,7 +18592,7 @@ setup.autoSetupTimeout(1, videojs);
  *
  * @type {String}
  */
-videojs.VERSION = '5.2.2';
+videojs.VERSION = '5.2.3';
 
 /**
  * The global options object. These are the settings that take effect

package.json

@@ -1,7 +1,7 @@
 {
   "name": "video.js",
   "description": "An HTML5 and Flash video player with a common API and skin for both.",
-  "version": "5.2.2",
+  "version": "5.2.3",
   "copyright": "Copyright Brightcove, Inc. <https://www.brightcove.com/>",
   "license": "Apache-2.0",
   "keywords": [

src/js/player.js

@@ -2107,6 +2107,7 @@ class Player extends Component {
     if (err === null) {
       this.error_ = err;
       this.removeClass('vjs-error');
+      this.errorDisplay.close();
       return this;
     }
 
@@ -2117,9 +2118,6 @@ class Player extends Component {
       this.error_ = new MediaError(err);
     }
 
-    // fire an error event on the player
-    this.trigger('error');
-
     // add the vjs-error classname to the player
     this.addClass('vjs-error');
 
@@ -2127,6 +2125,9 @@ class Player extends Component {
     // ie8 just logs "[object object]" if you just log the error object
     log.error(`(CODE:${this.error_.code} ${MediaError.errorTypes[this.error_.code]})`, this.error_.message, this.error_);
 
+    // fire an error event on the player
+    this.trigger('error');
+
     return this;
   }
 

test/unit/player.test.js

@@ -17,36 +17,6 @@ q.module('Player', {
   }
 });
 
-// Compiler doesn't like using 'this' in setup/teardown.
-// module("Player", {
-//   /**
-//    * @this {*}
-//    */
-//   setup: function(){
-//     window.player1 = true; // using window works
-//   },
-
-//   /**
-//    * @this {*}
-//    */
-//   teardown: function(){
-//     // if (this.player && this.player.el() !== null) {
-//     //   this.player.dispose();
-//     //   this.player = null;
-//     // }
-//   }
-// });
-
-// Object.size = function(obj) {
-//     var size = 0, key;
-//     for (key in obj) {
-//         console.log('key', key)
-//         if (obj.hasOwnProperty(key)) size++;
-//     }
-//     return size;
-// };
-
-
 test('should create player instance that inherits from component and dispose it', function(){
   var player = TestHelpers.makePlayer();
 
@@ -339,24 +309,6 @@ test('should set controls and trigger events', function() {
   player.dispose();
 });
 
-// Can't figure out how to test fullscreen events with tests
-// Browsers aren't triggering the events at least
-// asyncTest('should trigger the fullscreenchange event', function() {
-//   expect(3);
-
-//   var player = TestHelpers.makePlayer();
-//   player.on('fullscreenchange', function(){
-//     ok(true, 'fullscreenchange event fired');
-//     ok(this.isFullscreen() === true, 'isFullscreen is true');
-//     ok(this.el().className.indexOf('vjs-fullscreen') !== -1, 'vjs-fullscreen class added');
-
-//     player.dispose();
-//     start();
-//   });
-
-//   player.requestFullscreen();
-// });
-
 test('should toggle user the user state between active and inactive', function(){
   var player = TestHelpers.makePlayer({});
 
@@ -456,28 +408,6 @@ test('make sure that controls listeners do not get added too many times', functi
   player.dispose();
 });
 
-// test('should use custom message when encountering an unsupported video type',
-//     function() {
-//   videojs.options['notSupportedMessage'] = 'Video no go <a href="">link</a>';
-//   var fixture = document.getElementById('qunit-fixture');
-
-//   var html =
-//       '<video id="example_1">' +
-//           '<source src="fake.foo" type="video/foo">' +
-//           '</video>';
-
-//   fixture.innerHTML += html;
-
-//   var tag = document.getElementById('example_1');
-//   var player = new Player(tag, { techOrder: ['techFaker'] });
-
-//   var incompatibilityMessage = player.el().getElementsByTagName('p')[0];
-//   // ie8 capitalizes tag names
-//   equal(incompatibilityMessage.innerHTML.toLowerCase(), 'video no go <a href="">link</a>');
-
-//   player.dispose();
-// });
-
 test('should register players with generated ids', function(){
   var fixture, video, player, id;
   fixture = document.getElementById('qunit-fixture');
@@ -874,3 +804,21 @@ test('createModal() options object', function() {
   strictEqual(modal.options_.label, 'boo', 'modal options are set properly');
   modal.close();
 });
+
+test('you can clear error in the error event', function() {
+  let player = TestHelpers.makePlayer();
+
+  sinon.stub(log, 'error');
+
+  player.error({code: 4});
+  ok(player.error(), 'we have an error');
+  player.error(null);
+
+  player.one('error', function() {
+    player.error(null);
+  });
+  player.error({code: 4});
+  ok(!player.error(), 'we no longer have an error');
+
+  log.error.restore();
+});