Skip to content

/ ghostery-extension

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

GIS-866: Search Communication #647

Merged
merged 17 commits into from Jan 7, 2021
+80 −22
Merged

GIS-866: Search Communication #647

Changes from 1 commit
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
653632e
add search messager class and allow calling of refreshToken
fcjr Dec 22, 2020
0985b0f
only init on gb
fcjr Dec 22, 2020
0e51222
lint fixes
fcjr Dec 23, 2020
952a9f4
add since
fcjr Dec 23, 2020
b225f58
ensure browser info is populated
fcjr Dec 24, 2020
3e28136
remove gb IS const
fcjr Jan 4, 2021
935998f
fix isRefreshing invocation
fcjr Jan 5, 2021
496448e
move to main func, use finally
fcjr Jan 5, 2021
4f90be7
move window dispatch
fcjr Jan 5, 2021
0ca6af2
handle previously unhandled fetch rejections
fcjr Jan 5, 2021
f3d3ff8
refactor to use a single promise
fcjr Jan 5, 2021
5d70dab
Merge branch 'develop' into GIS-866_search_communication
fcjr Jan 5, 2021
e49e6bc
remove old event type
fcjr Jan 5, 2021
c878115
Merge branch 'GIS-866_search_communication' of github.com:ghostery/gh…
fcjr Jan 5, 2021
d8219d2
handle refreshToken errors
fcjr Jan 5, 2021
8e7bebd
update cc
fcjr Jan 6, 2021
eea4e9d
Merge branch 'develop' into GIS-866_search_communication
jsignanini Jan 6, 2021
File filter
Filter file types
Clear filters
Jump to
Jump to file
Failed to load files.

Always

Just for now

Prev Next
Loading status checks…

ensure browser info is populated

  • Loading branch information
@fcjr
fcjr committed Dec 24, 2020
Verified
This commit was signed with the committer’s verified signature.
fcjr Frank Chiarulli Jr.
GPG key ID: 262758B51E7A9804 Learn about vigilant mode.
commit b225f5899b74dff9d6a7764dac590c45752802bb
15 src/background.js
View file
Open in desktop
@@ -1651,12 +1651,15 @@ function initializeGhosteryModules() {
}

/**
* Initialize Search Message Handler.
* Initialize Search Message Handler on Ghostery Browser.
* @memberOf Background
*/
function initializeSearchMessageHandler() {
const sm = new SearchMessager();
sm.init();
async function initializeSearchMessageHandler() {
await globals.BROWSER_INFO_READY; // ensure browser info is set
if (IS_GHOSTERY_BROWSER) {
This conversation was marked as resolved by christophertino

This comment has been minimized.

Sign in to view
@christophertino

christophertino Jan 4, 2021
Member

change to BROWSER_INFO.name === 'ghostery_desktop'
const sm = new SearchMessager();
sm.init();
}
}

/**
@@ -1670,9 +1673,7 @@ function init() {
initializePopup();
initializeEventListeners();
initializeVersioning();
if (IS_GHOSTERY_BROWSER) {
initializeSearchMessageHandler();
}
initializeSearchMessageHandler();
return metrics.init(globals.JUST_INSTALLED).then(() => initializeGhosteryModules().then(() => {
account.migrate()
.then(() => {
ProTip! Use n and p to navigate between commits in a pull request.