From c2a291b8c208c64d17fa7e57103e8aa0384bff52 Mon Sep 17 00:00:00 2001 From: Elbert Alias Date: Fri, 10 Nov 2017 16:30:40 +1100 Subject: [PATCH] Fix column breaks in popup (always group categories) --- src/drivers/webextension/css/popup.css | 1 + src/drivers/webextension/js/iframe.js | 4 ++-- src/drivers/webextension/js/network.js | 2 ++ 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/src/drivers/webextension/css/popup.css b/src/drivers/webextension/css/popup.css index 5c922c3b0..4a86fde55 100644 --- a/src/drivers/webextension/css/popup.css +++ b/src/drivers/webextension/css/popup.css @@ -41,6 +41,7 @@ body { } .detected__category { + page-break-inside: avoid; break-inside: avoid-column; padding-bottom: 1rem; } diff --git a/src/drivers/webextension/js/iframe.js b/src/drivers/webextension/js/iframe.js index 1a88c1cd4..c62fdc471 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: '88d43ba-c', + mrev: 'b084b53-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 = '1506716276-29567-8539-3286-4931'; + var POST_MSG_ID = '1510070508-5767-8848-29475-8984'; 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 7c60d52a5..5842b9818 100644 --- a/src/drivers/webextension/js/network.js +++ b/src/drivers/webextension/js/network.js @@ -444,6 +444,8 @@ if ( videoId ) { request.isYoutubeAd = true; request.isVideo = true; + request.rawSrcUrl = frameUrl; + request.rawDestUrl = requestUrl; request.url = 'https://www.youtube.com/watch?v=' + this.parseYoutubeVideoIdFromUrl(requestUrl); } } else if ( !this.bannedRequest(request) &&