From 9f51f005b0cf21d594e9c7baef6191f248ee5b54 Mon Sep 17 00:00:00 2001 From: Kyle Spearrin Date: Mon, 2 Oct 2017 09:22:46 -0400 Subject: [PATCH] skip vis checks for notification bar collect() --- src/background.js | 20 +++++++++++++++----- src/content/autofill.js | 12 ++++++++++-- src/content/autofiller.js | 3 ++- src/content/notificationBar.js | 3 ++- src/popup/app/current/currentController.js | 12 ++++++++---- 5 files changed, 37 insertions(+), 13 deletions(-) diff --git a/src/background.js b/src/background.js index de4ba7c0..f0d54afd 100644 --- a/src/background.js +++ b/src/background.js @@ -67,7 +67,7 @@ var bg_isBackground = true, hitType: 'event', eventAction: 'Autofilled From Command' }); - collectPageDetailsForContentScript(tabs[0], 'autofill_cmd'); + collectPageDetailsForContentScript(tabs[0], 'autofill_cmd', false); } }); } @@ -101,7 +101,7 @@ var bg_isBackground = true, messageTab(sender.tab.id, 'adjustNotificationBar', msg.data); } else if (msg.command === 'bgCollectPageDetails') { - collectPageDetailsForContentScript(sender.tab, msg.sender); + collectPageDetailsForContentScript(sender.tab, msg.sender, msg.noVisibleChecks); } else if (msg.command === 'bgAddLogin') { addLogin(msg.login, sender.tab); @@ -560,12 +560,17 @@ var bg_isBackground = true, }); } - function collectPageDetailsForContentScript(tab, sender) { + function collectPageDetailsForContentScript(tab, sender, noVisibleChecks) { if (!tab || !tab.id) { return; } - chrome.tabs.sendMessage(tab.id, { command: 'collectPageDetails', tab: tab, sender: sender }, function () { + chrome.tabs.sendMessage(tab.id, { + command: 'collectPageDetails', + tab: tab, + sender: sender, + noVisibleChecks: noVisibleChecks + }, function () { if (chrome.runtime.lastError) { return; } @@ -737,7 +742,12 @@ var bg_isBackground = true, return; } - chrome.tabs.sendMessage(tab.id, { command: 'collectPageDetails', tab: tab, sender: 'contextMenu' }, function () { + chrome.tabs.sendMessage(tab.id, { + command: 'collectPageDetails', + tab: tab, + sender: 'contextMenu', + noVisibleChecks: false + }, function () { }); }); } diff --git a/src/content/autofill.js b/src/content/autofill.js index d2d3a7e3..d1fdb1f2 100644 --- a/src/content/autofill.js +++ b/src/content/autofill.js @@ -36,7 +36,7 @@ 3. Unminify and format to meet Mozilla review requirements. */ - function collect(document, undefined) { + function collect(document, undefined, noVisibleChecks) { var isFirefox = navigator.userAgent.indexOf('Firefox') !== -1 || navigator.userAgent.indexOf('Gecko/') !== -1; document.elementsByOPID = {}; @@ -457,6 +457,10 @@ // is a dom element visible on screen? function isElementVisible(el) { + if (noVisibleChecks) { + return true; + } + var theEl = el; el = (el = el.ownerDocument) ? el.defaultView : {}; @@ -480,6 +484,10 @@ // is a dom element "viewable" on screen? function isElementViewable(el) { + if (noVisibleChecks) { + return true; + } + var theDoc = el.ownerDocument.documentElement, rect = el.getBoundingClientRect(), docScrollWidth = theDoc.scrollWidth, @@ -958,7 +966,7 @@ chrome.runtime.onMessage.addListener(function (msg, sender, sendResponse) { if (msg.command === 'collectPageDetails') { - var pageDetails = collect(document); + var pageDetails = collect(document, msg.noVisibleChecks || false); var pageDetailsObj = JSON.parse(pageDetails); chrome.runtime.sendMessage({ command: 'collectPageDetailsResponse', diff --git a/src/content/autofiller.js b/src/content/autofiller.js index d402d838..cec32ffa 100644 --- a/src/content/autofiller.js +++ b/src/content/autofiller.js @@ -9,7 +9,8 @@ function fill() { chrome.runtime.sendMessage({ command: 'bgCollectPageDetails', - sender: 'autofiller' + sender: 'autofiller', + noVisibleChecks: false }); } }); diff --git a/src/content/notificationBar.js b/src/content/notificationBar.js index 358bf3fa..e776b320 100644 --- a/src/content/notificationBar.js +++ b/src/content/notificationBar.js @@ -42,7 +42,8 @@ if (!obj || !obj.disableAddLoginNotification) { chrome.runtime.sendMessage({ command: 'bgCollectPageDetails', - sender: 'notificationBar' + sender: 'notificationBar', + noVisibleChecks: true }); } }); diff --git a/src/popup/app/current/currentController.js b/src/popup/app/current/currentController.js index fecaef4f..215ab802 100644 --- a/src/popup/app/current/currentController.js +++ b/src/popup/app/current/currentController.js @@ -37,10 +37,14 @@ angular return; } - chrome.tabs.sendMessage(tabs[0].id, - { command: 'collectPageDetails', tab: tabs[0], sender: 'currentController' }, function () { - canAutofill = true; - }); + chrome.tabs.sendMessage(tabs[0].id, { + command: 'collectPageDetails', + tab: tabs[0], + sender: 'currentController', + noVisibleChecks: false + }, function () { + canAutofill = true; + }); $q.when(loginService.getAllDecryptedForDomain(domain)).then(function (logins) { $scope.loaded = true;