CMP behavior: events emits (#11)

Marfeel · Mar 18, 2019 · 6ec51dc · 6ec51dc
1 parent b011eec
commit 6ec51dc
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 0 deletions.
diff --git a/modules/marfeelAnalyticsAdapter.js b/modules/marfeelAnalyticsAdapter.js
@@ -56,13 +56,18 @@ let marfeelAnalyticsAdapter = Object.assign(adapter({url, analyticsType}),
         registerWinner(auctions[args.auctionId], args);
       } else if (eventType === AUCTION_END) {
         auctionEnd(auctions[args.auctionId], args);
+<<<<<<< HEAD
 <<<<<<< HEAD
       } else if (eventType === CONSENT_UPDATE) {
         registerCMPState(args);
       } else if (eventType === ERROR_SECURE_CREATIVE) {
         sendErrorEvent(eventType, args);
 =======
 >>>>>>> Marfeel 1.9
+=======
+      } else if (eventType === CONSENT_UPDATE) {
+        registerCMPState(args);
+>>>>>>> CMP behavior: events emits (#11)
       }
     },
 

diff --git a/src/AnalyticsAdapter.js b/src/AnalyticsAdapter.js
@@ -115,8 +115,12 @@ export default function AnalyticsAdapter({ url, analyticsType, global, handler }
           args.config = typeof config === 'object' ? config.options || {} : {}; // enableAnaltyics configuration object
           this.enqueue({ eventType: AUCTION_INIT, args });
         },
+<<<<<<< HEAD
         [CMP_UPDATE]: args => this.enqueue({ eventType: CMP_UPDATE, args }),
         [ERROR_SECURE_CREATIVE]: args => this.enqueue({ eventType: ERROR_SECURE_CREATIVE, args })
+=======
+        [CMP_UPDATE]: args => this.enqueue({ eventType: CMP_UPDATE, args })
+>>>>>>> CMP behavior: events emits (#11)
       };
 
       utils._each(_handlers, (handler, event) => {