fix: ignore progress events (#143)

videojs · Oct 4, 2018 · 348f670 · 348f670
1 parent 459f9fb
commit 348f670
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 34 deletions.
diff --git a/src/plugin.js b/src/plugin.js
@@ -15,7 +15,6 @@ const defaults = {
   message: '',
   timeout: 45 * 1000,
   dismiss: defaultDismiss,
-  progressDisabled: false,
   errors: {
     '1': {
       type: 'MEDIA_ERR_ABORTED',
@@ -194,10 +193,6 @@ const initPlugin = function(player, options) {
         resetMonitor();
       }
     });
-
-    if (!options.progressDisabled) {
-      healthcheck('progress', resetMonitor);
-    }
   };
 
   const onPlayNoSource = function() {
@@ -309,10 +304,9 @@ const initPlugin = function(player, options) {
     }
   };
 
-  reInitPlugin.disableProgress = function(disabled) {
-    options.progressDisabled = disabled;
-    onPlayStartMonitor();
-  };
+  // no-op API
+  // TODO: remove in a major version
+  reInitPlugin.disableProgress = () => {};
 
   player.on('play', onPlayStartMonitor);
   player.on('play', onPlayNoSource);
@@ -338,7 +332,7 @@ const errors = function(options) {
   initPlugin(this, videojs.mergeOptions(defaults, options));
 };
 
-['extend', 'getAll', 'disableProgress'].forEach(k => {
+['extend', 'getAll'].forEach(k => {
   errors[k] = function() {
     videojs.log.warn(
       `The errors.${k}() method is not available until the plugin has been initialized!`

diff --git a/test/plugin.test.js b/test/plugin.test.js
@@ -138,11 +138,9 @@ QUnit.test('no progress for 45 seconds is an error', function(assert) {
   assert.strictEqual(this.player.error().type, 'PLAYER_ERR_TIMEOUT');
 });
 
-QUnit.test('when progress watching is disabled, progress within 45 seconds is an error', function(assert) {
+QUnit.test('progress events are ignored during timeout', function(assert) {
   let errors = 0;
 
-  this.player.errors.disableProgress(true);
-
   this.player.on('error', function() {
     errors++;
   });
@@ -155,8 +153,6 @@ QUnit.test('when progress watching is disabled, progress within 45 seconds is an
   assert.strictEqual(errors, 1, 'emitted an error');
   assert.strictEqual(this.player.error().code, -2, 'error code is -2');
   assert.strictEqual(this.player.error().type, 'PLAYER_ERR_TIMEOUT');
-
-  this.player.errors.disableProgress(false);
 });
 
 QUnit.test('Flash API is unavailable when using Flash is an error', function(assert) {
@@ -217,7 +213,7 @@ QUnit.test('when dispose is triggered should not throw error ', function(assert)
   this.player = videojs(this.video);
 });
 
-QUnit.test('progress clears player timeout errors', function(assert) {
+QUnit.test('progress does not clear player timeout errors', function(assert) {
   let errors = 0;
 
   this.player.on('error', function() {
@@ -233,7 +229,7 @@ QUnit.test('progress clears player timeout errors', function(assert) {
   assert.strictEqual(this.player.error().type, 'PLAYER_ERR_TIMEOUT');
 
   this.player.trigger('progress');
-  assert.strictEqual(this.player.error(), null, 'error removed');
+  assert.strictEqual(this.player.error().code, -2, 'error code is -2');
 });
 
 QUnit.test('reinitialising plugin during playback starts timeout handler', function(assert) {
@@ -308,23 +304,6 @@ QUnit.test('timing out multiple times only throws a single error', function(asse
   assert.strictEqual(errors, 1, 'only one error fired');
 });
 
-QUnit.test('progress events while playing reset the player timeout', function(assert) {
-  let errors = 0;
-
-  this.player.on('error', function() {
-    errors++;
-  });
-  this.player.src(sources);
-  this.player.trigger('play');
-  // stalled for awhile
-  this.clock.tick(44 * 1000);
-  // but playback resumes!
-  this.player.trigger('progress');
-  this.clock.tick(44 * 1000);
-
-  assert.strictEqual(errors, 0, 'no errors emitted');
-});
-
 QUnit.test('no signs of playback triggers a player timeout', function(assert) {
   let errors = 0;