Pulling the trackers out into a separate method

theonion · Nov 6, 2014 · bf99bf6 · bf99bf6
1 parent a61fc1b
commit bf99bf6
Show file tree

Hide file tree

Showing 5 changed files with 47 additions and 225 deletions.
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -5,8 +5,6 @@ var specs = "spec/*Spec.js",
 
 var _ = require('lodash');
 
-var desireds = require('./spec/desireds.js');
-
 var gruntConfig = {
   env: {
     // dynamically filled

diff --git a/spec/VastPluginSpec.js b/spec/VastPluginSpec.js
@@ -236,6 +236,5 @@ describe('videojs.vast plugin', function() {
       });
 
     });
-
   });
 });
diff --git a/spec/desireds.js b/spec/desireds.js
diff --git a/spec/sauce-wd.js b/spec/sauce-wd.js
diff --git a/videojs.vast.js b/videojs.vast.js
@@ -93,46 +93,6 @@
 
                     player.vastTracker = new vast.tracker(ad, creative);
 
-                    var errorOccurred = false,
-                        canplayFn = function() {
-                          this.vastTracker.load();
-                        },
-                        timeupdateFn = function() {
-                          if (isNaN(this.vastTracker.assetDuration)) {
-                            this.vastTracker.assetDuration = this.duration();
-                          }
-                          this.vastTracker.setProgress(this.currentTime());
-                        },
-                        playFn = function() {
-                          this.vastTracker.setPaused(false);
-                        },
-                        pauseFn = function() {
-                          this.vastTracker.setPaused(true);
-                        },
-                        errorFn = function() {
-                          // Inform ad server we couldn't play the media file for this ad
-                          vast.util.track(ad.errorURLTemplates, {ERRORCODE: 405});
-                          errorOccurred = true;
-                          player.trigger('ended');
-                        };
-
-                    player.on('canplay', canplayFn);
-                    player.on('timeupdate', timeupdateFn);
-                    player.on('play', playFn);
-                    player.on('pause', pauseFn);
-                    player.on('error', errorFn);
-
-                    player.one('ended', function() {
-                      player.off('canplay', canplayFn);
-                      player.off('timeupdate', timeupdateFn);
-                      player.off('play', playFn);
-                      player.off('pause', pauseFn);
-                      player.off('error', errorFn);
-                      if (!errorOccurred) {
-                        this.vastTracker.complete();
-                      }
-                    });
-
                     foundCreative = true;
                   }
 
@@ -163,6 +123,51 @@
         });
       },
 
+      setupEvents: function() {
+
+        var errorOccurred = false,
+            canplayFn = function() {
+              player.vastTracker.load();
+            },
+            timeupdateFn = function() {
+              if (isNaN(player.vastTracker.assetDuration)) {
+                player.vastTracker.assetDuration = player.duration();
+              }
+              player.vastTracker.setProgress(player.currentTime());
+            },
+            playFn = function() {
+              if (player.ads.state === 'ad-playback') {
+                player.vastTracker.setPaused(false);
+              }
+            },
+            pauseFn = function() {
+              player.vastTracker.setPaused(true);
+            },
+            errorFn = function() {
+              // Inform ad server we couldn't play the media file for this ad
+              vast.util.track(player.vastTracker.ad.errorURLTemplates, {ERRORCODE: 405});
+              errorOccurred = true;
+              player.trigger('ended');
+            };
+
+        player.on('canplay', canplayFn);
+        player.on('timeupdate', timeupdateFn);
+        player.on('play', playFn);
+        player.on('pause', pauseFn);
+        player.on('error', errorFn);
+
+        player.one('ended', function() {
+          player.off('canplay', canplayFn);
+          player.off('timeupdate', timeupdateFn);
+          player.off('play', playFn);
+          player.off('pause', pauseFn);
+          player.off('error', errorFn);
+          if (!errorOccurred) {
+            player.vastTracker.complete();
+          }
+        });
+      },
+
       preroll: function() {
         player.ads.startLinearAdMode();
         player.vast.showControls = player.controls();
@@ -223,6 +228,8 @@
           }
         };
 
+        player.vast.setupEvents();
+
         player.one('ended', player.vast.tearDown);
 
         player.trigger('vast-preroll-ready');