@mjhls/mjh-framework 1.0.691-beta.3 → 1.0.691-beta.5

package/dist/cjs/{getTargeting-9af0ef69.js → getTargeting-fee8c429.js}

@@ -1,7 +1,7 @@
 'use strict';
 
 var toConsumableArray = require('./toConsumableArray-9a3476fe.js');
-var _extends$1 = require('./extends-60837c34.js');
+var _extends = require('./extends-60837c34.js');
 
 var getContentPlacementUrl = function getContentPlacementUrl(cp) {
     var cp_url = '';
@@ -133,7 +133,7 @@ var getTargeting = function getTargeting(props) {
   }
 
   if (props.cache && props.cache.hyperTargeting) {
-    targeting = _extends$1._extends({}, targeting, { campaign_id: props.cache.hyperTargeting });
+    targeting = _extends._extends({}, targeting, { campaign_id: props.cache.hyperTargeting });
   }
 
   if (position && position.length) {

package/dist/cjs/getTargeting.js

@@ -8,7 +8,7 @@ require('./toConsumableArray-9a3476fe.js');
 require('./core.get-iterator-method-f62321d4.js');
 require('./_object-pie-68c5bcbc.js');
 require('./extends-60837c34.js');
-var getTargeting = require('./getTargeting-9af0ef69.js');
+var getTargeting = require('./getTargeting-fee8c429.js');
 
 
 

package/dist/cjs/{index-fa8ed292.js → index-099d45ae.js}

@@ -728,6 +728,8 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
 
     return new Promise(function (resolve) {
       _this3.getGoogletag().then(function (googletag) {
+        _this3.configureInitialOptions(googletag);
+
         slotsToInitialize.forEach(function (currentSlotId) {
           registeredSlots[currentSlotId].loading = false;
           googletag.cmd.push(function () {
@@ -791,14 +793,25 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
       });
     });
   },
-  configureOptions: function configureOptions(googletag) {
+  // configure those gpt parameters that need to be set before pubsads service
+  // initialization.
+  configureInitialOptions: function configureInitialOptions(googletag) {
     var _this4 = this;
 
+    googletag.cmd.push(function () {
+      if (_this4.disableInitialLoadIsEnabled()) {
+        googletag.pubads().disableInitialLoad();
+      }
+    });
+  },
+  configureOptions: function configureOptions(googletag) {
+    var _this5 = this;
+
     googletag.cmd.push(function () {
       var pubadsService = googletag.pubads();
-      pubadsService.setRequestNonPersonalizedAds(_this4.personalizedAdsEnabled() ? 0 : 1);
+      pubadsService.setRequestNonPersonalizedAds(_this5.personalizedAdsEnabled() ? 0 : 1);
 
-      var targetingArguments = _this4.getTargetingArguments(); // set global targetting arguments
+      var targetingArguments = _this5.getTargetingArguments(); // set global targetting arguments
 
 
       Object.keys(targetingArguments).forEach(function (varName) {
@@ -807,16 +820,16 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         }
       }); // set global adSense attributes
 
-      var adSenseAttributes = _this4.getAdSenseAttributes();
+      var adSenseAttributes = _this5.getAdSenseAttributes();
 
       Object.keys(adSenseAttributes).forEach(function (key) {
         pubadsService.set(key, adSenseAttributes[key]);
       });
 
-      if (_this4.lazyLoadIsEnabled()) {
+      if (_this5.lazyLoadIsEnabled()) {
         var args = [];
 
-        var config = _this4.getLazyLoadConfig();
+        var config = _this5.getLazyLoadConfig();
 
         if (config !== null) {
           args.push(config);
@@ -825,16 +838,12 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         pubadsService.enableLazyLoad.call(args);
       }
 
-      if (_this4.singleRequestIsEnabled()) {
+      if (_this5.singleRequestIsEnabled()) {
         pubadsService.enableSingleRequest();
       }
 
-      if (_this4.disableInitialLoadIsEnabled()) {
-        pubadsService.disableInitialLoad();
-      }
-
-      if (_this4.collapseEmptyDivs === true || _this4.collapseEmptyDivs === false) {
-        pubadsService.collapseEmptyDivs(_this4.collapseEmptyDivs);
+      if (_this5.collapseEmptyDivs === true || _this5.collapseEmptyDivs === false) {
+        pubadsService.collapseEmptyDivs(_this5.collapseEmptyDivs);
       }
     });
   },
@@ -876,10 +885,10 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     }
   },
   gptRefreshAds: function gptRefreshAds(slots) {
-    var _this5 = this;
+    var _this6 = this;
 
     return this.getGoogletag().then(function (googletag) {
-      _this5.configureOptions(googletag);
+      _this6.configureOptions(googletag);
 
       googletag.cmd.push(function () {
         var pubadsService = googletag.pubads();
@@ -890,14 +899,14 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   reload: function reload() {
-    var _this6 = this;
+    var _this7 = this;
 
     return this.destroyGPTSlots.apply(this, arguments).then(function () {
-      return _this6.load();
+      return _this7.load();
     });
   },
   destroyGPTSlots: function destroyGPTSlots() {
-    var _this7 = this;
+    var _this8 = this;
 
     for (var _len4 = arguments.length, slotsToDestroy = new Array(_len4), _key4 = 0; _key4 < _len4; _key4++) {
       slotsToDestroy[_key4] = arguments[_key4];
@@ -917,7 +926,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
         slots.push(slot);
       }
 
-      _this7.getGoogletag().then(function (googletag) {
+      _this8.getGoogletag().then(function (googletag) {
         googletag.cmd.push(function () {
           if (managerAlreadyInitialized === true) {
             if (slotsToDestroy.length > 0) {
@@ -940,7 +949,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
     });
   },
   registerSlot: function registerSlot(_ref) {
-    var _this8 = this;
+    var _this9 = this;
 
     var slotId = _ref.slotId,
         dfpNetworkId = _ref.dfpNetworkId,
@@ -979,7 +988,7 @@ var DFPManager = Object.assign(new EventEmitter.EventEmitter().setMaxListeners(0
                 gptSlot = slot.gptSlot;
 
             if (loading === false && !gptSlot) {
-              _this8.load(slotId);
+              _this9.load(slotId);
             }
           }
         });