renames optimizeAds

modules/jwplayerVideoProvider.js

@@ -243,6 +243,7 @@ export function JWPlayerProvider(config, jwplayer_, adState_, timeState_, callba
         break;
 
       case AD_IMPRESSION:
+      case AD_CLICK:
         getEventPayload = () => Object.assign({}, adState.getState(), timeState.getState());
         break;
 
@@ -257,10 +258,6 @@ export function JWPlayerProvider(config, jwplayer_, adState_, timeState_, callba
         };
         break;
 
-      case AD_CLICK:
-        getEventPayload = () => Object.assign({}, adState.getState(), timeState.getState());
-        break;
-
       case AD_SKIPPED:
         getEventPayload = e => {
           adState.clearState();
@@ -564,7 +561,7 @@ export const utils = {
       jwConfig.key = config.licenseKey;
     }
 
-    if (params.adOptimization === false) {
+    if (config.setupAds === false) {
       return jwConfig;
     }
 

modules/videoModule/coreVideo.js

@@ -44,8 +44,9 @@ import { ParentModule, SubmoduleBuilder } from '../../libraries/video/shared/par
 
 /**
  * @function VideoProvider#onEvent
- * @param {string} events - name of event for which the listener should be added
- * @param {function} callback - function that will get called when one of the events is triggered
+ * @param {string} event - name of event for which the listener should be added
+ * @param {function} callback - function that will get called when the event is triggered
+ * @param {Object} basePayload - Base payload for every event; includes common parameters such as divId and type. Event payload should be built on top of this.
  */
 
 /**

modules/videoModule/index.js

@@ -198,10 +198,10 @@ export function PbVideo(videoCore_, getConfig_, pbGlobal_, pbEvents_, videoEvent
   }
 
   // options: adXml, winner, adUnitCode,
-  function loadAdTag(adUrl, divId, options) {
-    const payload = Object.assign({ adUrl }, options);
+  function loadAdTag(adTagUrl, divId, options) {
+    const payload = Object.assign({ adTagUrl }, options);
     pbEvents.emit(getExternalVideoEventName(AUCTION_AD_LOAD_ATTEMPT), payload);
-    videoCore.setAdTagUrl(adUrl, divId, options);
+    videoCore.setAdTagUrl(adTagUrl, divId, options);
   }
 
   function triggerVideoBidEvent(eventName, adEventPayload) {

modules/videojsVideoProvider.js

@@ -810,7 +810,7 @@ export function adStateFactory() {
           break
 
         default:
-          updates.offset = adPodInfo.timeOffset;
+          updates.offset = '' + adPodInfo.timeOffset;
       }
     }
 

test/spec/modules/videoModule/submodules/jwplayerVideoProvider_spec.js

@@ -608,18 +608,19 @@ describe('utils', function () {
       expect(jwConfig).to.not.have.property('key');
     });
 
-    it('should exclude fallback ad block when adOptimization is explicitly disabled', function () {
+    it('should exclude fallback ad block when setupAds is explicitly disabled', function () {
       let jwConfig = getJwConfig({
+        setupAds: false,
         params: {
-          adOptimization: false,
+
           vendorConfig: {}
         }
       });
 
       expect(jwConfig).to.not.have.property('advertising');
     });
 
-    it('should set advertising block when adOptimization is allowed', function () {
+    it('should set advertising block when setupAds is allowed', function () {
       let jwConfig = getJwConfig({
         params: {
           vendorConfig: {