From 35a77acc14672b84e474bd7aedf49c75b6e0f2da Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Sun, 1 Oct 2017 13:26:05 +1100 Subject: [PATCH] Fix merge --- bin/build | 0 bin/dev | 0 bin/help | 0 bin/links | 0 bin/run | 0 bin/validate | 0 bin/validate-icons | 0 bin/validate-regex | 0 run | 0 src/apps.json | 0 src/drivers/webextension/css/popup.css | 1 - src/drivers/webextension/js/iframe.js | 4 ++-- src/drivers/webextension/js/network.js | 15 ++++++--------- src/icons/3DM.png | Bin src/icons/3ware.png | Bin src/icons/ATEN.png | Bin src/icons/Amazon-Cloudfront.svg | 0 src/icons/ApexPages.png | Bin src/icons/BaseHTTP.png | Bin src/icons/BoldChat.png | Bin src/icons/Brother.png | Bin src/icons/Canon.png | Bin src/icons/Catwalk.png | Bin src/icons/CherryPy.png | Bin src/icons/Cloudera.png | Bin src/icons/Darwin.png | Bin src/icons/Dell.png | Bin src/icons/DovetailWRP.png | Bin src/icons/EWS-NIC4.png | Bin src/icons/Erlang.png | Bin src/icons/FancyBox.png | Bin src/icons/Grandstream.png | Bin src/icons/Hotjar.png | Bin src/icons/Indico.png | Bin src/icons/InfernoJS.png | Bin src/icons/JC-HTTPD.png | Bin src/icons/Jetty.png | Bin src/icons/Jive.png | Bin src/icons/KS_HTTP.png | Bin src/icons/Koala Framework.png | Bin src/icons/LabVIEW.png | Bin src/icons/LivePerson.png | Bin src/icons/Logitech Media Server.png | Bin src/icons/MOBOTIX.png | Bin src/icons/Medium.svg | 0 src/icons/NodeBB.png | Bin src/icons/Olark.png | Bin src/icons/PerfSONAR-PS.png | Bin src/icons/Sentinel.png | Bin src/icons/Splunk.png | Bin src/icons/Subrion.png | Bin src/icons/Tealium.png | Bin src/icons/Telescope.png | Bin src/icons/Wowza Media Server.png | Bin src/icons/XAMPP.png | Bin src/icons/Zabbix.png | Bin src/icons/aws-ec2.svg | 0 src/icons/aws-s3.svg | 0 src/icons/debut.png | Bin src/icons/eSyndiCat.png | Bin src/icons/mod_perl.png | Bin src/icons/osTicket.png | Bin src/icons/uCore.png | Bin 63 files changed, 8 insertions(+), 12 deletions(-) mode change 100755 => 100644 bin/build mode change 100755 => 100644 bin/dev mode change 100755 => 100644 bin/help mode change 100755 => 100644 bin/links mode change 100755 => 100644 bin/run mode change 100755 => 100644 bin/validate mode change 100755 => 100644 bin/validate-icons mode change 100755 => 100644 bin/validate-regex mode change 100755 => 100644 run mode change 100755 => 100644 src/apps.json mode change 100755 => 100644 src/icons/3DM.png mode change 100755 => 100644 src/icons/3ware.png mode change 100755 => 100644 src/icons/ATEN.png mode change 100755 => 100644 src/icons/Amazon-Cloudfront.svg mode change 100755 => 100644 src/icons/ApexPages.png mode change 100755 => 100644 src/icons/BaseHTTP.png mode change 100755 => 100644 src/icons/BoldChat.png mode change 100755 => 100644 src/icons/Brother.png mode change 100755 => 100644 src/icons/Canon.png mode change 100755 => 100644 src/icons/Catwalk.png mode change 100755 => 100644 src/icons/CherryPy.png mode change 100755 => 100644 src/icons/Cloudera.png mode change 100755 => 100644 src/icons/Darwin.png mode change 100755 => 100644 src/icons/Dell.png mode change 100755 => 100644 src/icons/DovetailWRP.png mode change 100755 => 100644 src/icons/EWS-NIC4.png mode change 100755 => 100644 src/icons/Erlang.png mode change 100755 => 100644 src/icons/FancyBox.png mode change 100755 => 100644 src/icons/Grandstream.png mode change 100755 => 100644 src/icons/Hotjar.png mode change 100755 => 100644 src/icons/Indico.png mode change 100755 => 100644 src/icons/InfernoJS.png mode change 100755 => 100644 src/icons/JC-HTTPD.png mode change 100755 => 100644 src/icons/Jetty.png mode change 100755 => 100644 src/icons/Jive.png mode change 100755 => 100644 src/icons/KS_HTTP.png mode change 100755 => 100644 src/icons/Koala Framework.png mode change 100755 => 100644 src/icons/LabVIEW.png mode change 100755 => 100644 src/icons/LivePerson.png mode change 100755 => 100644 src/icons/Logitech Media Server.png mode change 100755 => 100644 src/icons/MOBOTIX.png mode change 100755 => 100644 src/icons/Medium.svg mode change 100755 => 100644 src/icons/NodeBB.png mode change 100755 => 100644 src/icons/Olark.png mode change 100755 => 100644 src/icons/PerfSONAR-PS.png mode change 100755 => 100644 src/icons/Sentinel.png mode change 100755 => 100644 src/icons/Splunk.png mode change 100755 => 100644 src/icons/Subrion.png mode change 100755 => 100644 src/icons/Tealium.png mode change 100755 => 100644 src/icons/Telescope.png mode change 100755 => 100644 src/icons/Wowza Media Server.png mode change 100755 => 100644 src/icons/XAMPP.png mode change 100755 => 100644 src/icons/Zabbix.png mode change 100755 => 100644 src/icons/aws-ec2.svg mode change 100755 => 100644 src/icons/aws-s3.svg mode change 100755 => 100644 src/icons/debut.png mode change 100755 => 100644 src/icons/eSyndiCat.png mode change 100755 => 100644 src/icons/mod_perl.png mode change 100755 => 100644 src/icons/osTicket.png mode change 100755 => 100644 src/icons/uCore.png diff --git a/bin/build b/bin/build old mode 100755 new mode 100644 diff --git a/bin/dev b/bin/dev old mode 100755 new mode 100644 diff --git a/bin/help b/bin/help old mode 100755 new mode 100644 diff --git a/bin/links b/bin/links old mode 100755 new mode 100644 diff --git a/bin/run b/bin/run old mode 100755 new mode 100644 diff --git a/bin/validate b/bin/validate old mode 100755 new mode 100644 diff --git a/bin/validate-icons b/bin/validate-icons old mode 100755 new mode 100644 diff --git a/bin/validate-regex b/bin/validate-regex old mode 100755 new mode 100644 diff --git a/run b/run old mode 100755 new mode 100644 diff --git a/src/apps.json b/src/apps.json old mode 100755 new mode 100644 diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css index 5c922c3b0..31479c0b0 100644 --- a/src/drivers/webextension/css/popup.css +++ b/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; diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js index af4d823a6..1a88c1cd4 100644 --- a/src/drivers/webextension/js/iframe.js +++ b/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) { diff --git a/src/drivers/webextension/js/network.js b/src/drivers/webextension/js/network.js index 1ff4dadb5..7c60d52a5 100644 --- a/src/drivers/webextension/js/network.js +++ b/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 { diff --git a/src/icons/3DM.png b/src/icons/3DM.png old mode 100755 new mode 100644 diff --git a/src/icons/3ware.png b/src/icons/3ware.png old mode 100755 new mode 100644 diff --git a/src/icons/ATEN.png b/src/icons/ATEN.png old mode 100755 new mode 100644 diff --git a/src/icons/Amazon-Cloudfront.svg b/src/icons/Amazon-Cloudfront.svg old mode 100755 new mode 100644 diff --git a/src/icons/ApexPages.png b/src/icons/ApexPages.png old mode 100755 new mode 100644 diff --git a/src/icons/BaseHTTP.png b/src/icons/BaseHTTP.png old mode 100755 new mode 100644 diff --git a/src/icons/BoldChat.png b/src/icons/BoldChat.png old mode 100755 new mode 100644 diff --git a/src/icons/Brother.png b/src/icons/Brother.png old mode 100755 new mode 100644 diff --git a/src/icons/Canon.png b/src/icons/Canon.png old mode 100755 new mode 100644 diff --git a/src/icons/Catwalk.png b/src/icons/Catwalk.png old mode 100755 new mode 100644 diff --git a/src/icons/CherryPy.png b/src/icons/CherryPy.png old mode 100755 new mode 100644 diff --git a/src/icons/Cloudera.png b/src/icons/Cloudera.png old mode 100755 new mode 100644 diff --git a/src/icons/Darwin.png b/src/icons/Darwin.png old mode 100755 new mode 100644 diff --git a/src/icons/Dell.png b/src/icons/Dell.png old mode 100755 new mode 100644 diff --git a/src/icons/DovetailWRP.png b/src/icons/DovetailWRP.png old mode 100755 new mode 100644 diff --git a/src/icons/EWS-NIC4.png b/src/icons/EWS-NIC4.png old mode 100755 new mode 100644 diff --git a/src/icons/Erlang.png b/src/icons/Erlang.png old mode 100755 new mode 100644 diff --git a/src/icons/FancyBox.png b/src/icons/FancyBox.png old mode 100755 new mode 100644 diff --git a/src/icons/Grandstream.png b/src/icons/Grandstream.png old mode 100755 new mode 100644 diff --git a/src/icons/Hotjar.png b/src/icons/Hotjar.png old mode 100755 new mode 100644 diff --git a/src/icons/Indico.png b/src/icons/Indico.png old mode 100755 new mode 100644 diff --git a/src/icons/InfernoJS.png b/src/icons/InfernoJS.png old mode 100755 new mode 100644 diff --git a/src/icons/JC-HTTPD.png b/src/icons/JC-HTTPD.png old mode 100755 new mode 100644 diff --git a/src/icons/Jetty.png b/src/icons/Jetty.png old mode 100755 new mode 100644 diff --git a/src/icons/Jive.png b/src/icons/Jive.png old mode 100755 new mode 100644 diff --git a/src/icons/KS_HTTP.png b/src/icons/KS_HTTP.png old mode 100755 new mode 100644 diff --git a/src/icons/Koala Framework.png b/src/icons/Koala Framework.png old mode 100755 new mode 100644 diff --git a/src/icons/LabVIEW.png b/src/icons/LabVIEW.png old mode 100755 new mode 100644 diff --git a/src/icons/LivePerson.png b/src/icons/LivePerson.png old mode 100755 new mode 100644 diff --git a/src/icons/Logitech Media Server.png b/src/icons/Logitech Media Server.png old mode 100755 new mode 100644 diff --git a/src/icons/MOBOTIX.png b/src/icons/MOBOTIX.png old mode 100755 new mode 100644 diff --git a/src/icons/Medium.svg b/src/icons/Medium.svg old mode 100755 new mode 100644 diff --git a/src/icons/NodeBB.png b/src/icons/NodeBB.png old mode 100755 new mode 100644 diff --git a/src/icons/Olark.png b/src/icons/Olark.png old mode 100755 new mode 100644 diff --git a/src/icons/PerfSONAR-PS.png b/src/icons/PerfSONAR-PS.png old mode 100755 new mode 100644 diff --git a/src/icons/Sentinel.png b/src/icons/Sentinel.png old mode 100755 new mode 100644 diff --git a/src/icons/Splunk.png b/src/icons/Splunk.png old mode 100755 new mode 100644 diff --git a/src/icons/Subrion.png b/src/icons/Subrion.png old mode 100755 new mode 100644 diff --git a/src/icons/Tealium.png b/src/icons/Tealium.png old mode 100755 new mode 100644 diff --git a/src/icons/Telescope.png b/src/icons/Telescope.png old mode 100755 new mode 100644 diff --git a/src/icons/Wowza Media Server.png b/src/icons/Wowza Media Server.png old mode 100755 new mode 100644 diff --git a/src/icons/XAMPP.png b/src/icons/XAMPP.png old mode 100755 new mode 100644 diff --git a/src/icons/Zabbix.png b/src/icons/Zabbix.png old mode 100755 new mode 100644 diff --git a/src/icons/aws-ec2.svg b/src/icons/aws-ec2.svg old mode 100755 new mode 100644 diff --git a/src/icons/aws-s3.svg b/src/icons/aws-s3.svg old mode 100755 new mode 100644 diff --git a/src/icons/debut.png b/src/icons/debut.png old mode 100755 new mode 100644 diff --git a/src/icons/eSyndiCat.png b/src/icons/eSyndiCat.png old mode 100755 new mode 100644 diff --git a/src/icons/mod_perl.png b/src/icons/mod_perl.png old mode 100755 new mode 100644 diff --git a/src/icons/osTicket.png b/src/icons/osTicket.png old mode 100755 new mode 100644 diff --git a/src/icons/uCore.png b/src/icons/uCore.png old mode 100755 new mode 100644