Fix merge

src/drivers/webextension/css/popup.css

@@ -2,7 +2,6 @@ body {
 	background: #fff;
 	font-family: Helvetica, Arial, sans-serif;
   font-size: .8rem;
-  height: 20.8rem;
 	margin: 0;
   overflow: hidden;
   width: 30rem;

src/drivers/webextension/js/iframe.js

@@ -181,7 +181,7 @@ var exports = {};
 				video_assets: opt_video_assets,
 				assets: opt_assets,
 				version: '3',
-				mrev: '6f3a97b-c',
+				mrev: '88d43ba-c',
 				msgNum: this.msgNum,
 				timestamp: new Date().getTime(),
 				pageVis: document.visibilityState,
@@ -890,7 +890,7 @@ var exports = {};
 	var _pageTags;
 	var INIT_MS_BW_SEARCHES = 2000;
 	var PAGE_TAG_RE = new RegExp('gpt|oascentral');
-	var POST_MSG_ID = '1503946945-8336-24876-10613-9147';
+	var POST_MSG_ID = '1506716276-29567-8539-3286-4931';
 	var AD_SERVER_RE = new RegExp('^(google_ads_iframe|oas_frame|atwAdFrame)');
 
 	function getPageTags(doc) {

src/drivers/webextension/js/network.js

@@ -280,20 +280,19 @@
 		browserProxy.tabs.sendMessage(this.tabId, message);
 	};
 
-	PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, nonAdTrackingEvent) {
+	PageNetworkTrafficCollector.prototype.sendToTab = function(assetReq, reqs, curPageUrl, adTrackingEvent) {
 		var msg = {};
 		msg.assets = [];
 		msg.requests = [];
 		msg.event_data = {};
-		if (  !nonAdTrackingEvent  ) {
-			msg.event = 'new-video-ad';
+		msg.event = adTrackingEvent;
+		if ( adTrackingEvent === 'new-video-ad' ) {
 			msg.requests = reqs;
 			msg.requests.sort(function(reqA, reqB) {return reqA.requestTimestamp - reqB.requestTimestamp;});
 			if ( assetReq ) {
 				msg.assets = [assetReq];
 			}
-		} else if ( nonAdTrackingEvent === 'new-invalid-video-ad' ) {
-			msg.event = nonAdTrackingEvent;
+		} else if ( adTrackingEvent === 'new-invalid-video-ad' ) {
 			msg.requests = reqs.map(function(request) {
 				return parseHostnameFromUrl(request.url);
 			});
@@ -304,8 +303,6 @@
 				contentType: assetReq.contentType,
 				size: assetReq.size
 			}];
-		} else if ( nonAdTrackingEvent === 'robots-txt-no-scraping' ) {
-			msg.event = nonAdTrackingEvent;
 		}
 		msg.origUrl = curPageUrl;
 		msg.displayAdFound = this.displayAdFound;
@@ -635,10 +632,10 @@
 				var tagReqs = _this.grabTagReqs(rawRequests, msgAssetReq);
 
 				if ( _this.isValidVideoAd(msgAssetReq, tagReqs) ) {
-					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, true);
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-video-ad');
 				} else {
 
-					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, false);
+					_this.sendToTab(msgAssetReq, tagReqs, origPageUrl, 'new-invalid-video-ad');
 				}
 
 			} else {