From bdcba8197fa9bd1f28e81ced8312ee86e98d871b Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Tue, 20 Mar 2018 13:26:18 -0400 Subject: [PATCH 1/3] Fix for GH-877, GH-886, GH-872. --- _locales/de/messages.json | 14 +++++++--- _locales/en/messages.json | 11 +++++--- _locales/es/messages.json | 9 ++++--- _locales/fr/messages.json | 9 ++++--- _locales/hu/messages.json | 9 ++++--- _locales/it/messages.json | 9 ++++--- _locales/ja/messages.json | 9 ++++--- _locales/ko/messages.json | 9 ++++--- _locales/nl/messages.json | 9 ++++--- _locales/pl/messages.json | 9 ++++--- _locales/pt_BR/messages.json | 9 ++++--- _locales/ru/messages.json | 9 ++++--- _locales/zh_CN/messages.json | 9 ++++--- _locales/zh_TW/messages.json | 9 ++++--- app/panel/components/Summary.jsx | 8 +++--- app/panel/components/Tooltip.jsx | 2 +- app/scss/setup.scss | 4 +++ src/background.js | 44 +++++++++++++++++--------------- src/utils/utils.js | 4 +++ 19 files changed, 125 insertions(+), 70 deletions(-) diff --git a/_locales/de/messages.json b/_locales/de/messages.json index 02b674c09..1677944aa 100644 --- a/_locales/de/messages.json +++ b/_locales/de/messages.json @@ -1110,6 +1110,9 @@ "tooltip_anti_track_body": { "message": "Anonymisieren Sie entsperrte und unbekannte Tracker für besseren Browsing-Schutz." }, + "tooltip_body_in_cliqz": { + "message": "Bereits als Standard in Cliqz aktiviert." + }, "tooltip_ad_block": { "message": "Besserer Werbeblocker" }, @@ -1422,7 +1425,7 @@ "message": "Was ist neu?" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Ghostery installieren" }, "global_settings_saved": { "message": "Globale Einstellungen gespeichert" @@ -1461,7 +1464,7 @@ "message": "Meine Analysedaten teilen, um Ghostery noch leistungsstärker zu machen." }, "setup_feature_active_in_cliqz": { - "message": "Diese Funktion ist in Cliqz bereits standardmäßig aktiviert. $LINK_START$Weitere Informationen$LINK_END$", + "message": "Bereits als Standard in Cliqz aktiviert. $LINK_START$Mehr erfahren.$LINK_END$", "placeholders": { "link_start": { "content": "" @@ -1481,5 +1484,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Release-Hinweise für alle Updates ansehen" + } +} \ No newline at end of file diff --git a/_locales/en/messages.json b/_locales/en/messages.json index 71cf2fc64..1e198c2fd 100644 --- a/_locales/en/messages.json +++ b/_locales/en/messages.json @@ -1146,6 +1146,9 @@ "tooltip_anti_track_body": { "message": "Anonymize unblocked and unknown trackers for greater browsing protection." }, + "tooltip_body_in_cliqz": { + "message": "Feature already active in Cliqz by default." + }, "tooltip_ad_block": { "message": "Enhanced Ad Blocking" }, @@ -1487,15 +1490,15 @@ "message": "Set Me Up" }, "enable_when_paused": { - "message": "To execute this function, please resume Ghostery." + "message": "To use this function, Resume Ghostery." }, "enable_when_whitelisted": { - "message": "To execute this function, please undo Trust site." + "message": "To use this function, undo Trust Site" }, "enable_when_blacklisted": { - "message": "To execute this function, please undo Restrict site." + "message": "To use this function, undo Restrict Site." }, "enable_when_not_scanned": { - "message": "To execute this function, please navigate to a site which can be scanned." + "message": "To use this function, navigate to another page." } } diff --git a/_locales/es/messages.json b/_locales/es/messages.json index 5c28745d0..b3a744cc7 100644 --- a/_locales/es/messages.json +++ b/_locales/es/messages.json @@ -1422,7 +1422,7 @@ "message": "¿Qué novedades hay?" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Configurar Ghostery" }, "global_settings_saved": { "message": "Ajustes globales guardados" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Consulte las notas de lantamiento para todas las actualizaciones" + } +} \ No newline at end of file diff --git a/_locales/fr/messages.json b/_locales/fr/messages.json index fb105d401..df21b0cd8 100644 --- a/_locales/fr/messages.json +++ b/_locales/fr/messages.json @@ -1422,7 +1422,7 @@ "message": "Procédez à l'installation" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Installer Ghostery" }, "global_settings_saved": { "message": "Paramètres globaux sauvegardés" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Voir les notes de mise à jour pour connaître toutes les nouveautés" + } +} \ No newline at end of file diff --git a/_locales/hu/messages.json b/_locales/hu/messages.json index 07339a603..5699ad445 100644 --- a/_locales/hu/messages.json +++ b/_locales/hu/messages.json @@ -1422,7 +1422,7 @@ "message": "Mik az újdonságok?" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "A Ghostery beállítása" }, "global_settings_saved": { "message": "Globális beállítások mentve" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Az összes" + } +} \ No newline at end of file diff --git a/_locales/it/messages.json b/_locales/it/messages.json index ac92f3732..3a08baaf0 100644 --- a/_locales/it/messages.json +++ b/_locales/it/messages.json @@ -1422,7 +1422,7 @@ "message": "Le novità" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Configura Ghostery" }, "global_settings_saved": { "message": "Impostazioni Globali Salvate" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Vedi le note di rilascio per tutti gli aggiornamenti" + } +} \ No newline at end of file diff --git a/_locales/ja/messages.json b/_locales/ja/messages.json index e63a3b380..77aa4bf3c 100644 --- a/_locales/ja/messages.json +++ b/_locales/ja/messages.json @@ -1422,7 +1422,7 @@ "message": "最新情報" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Ghosteryをセットアップ" }, "global_settings_saved": { "message": "グローバル設定が保存されました" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "すべての更新情報についてはリリースノートをご覧ください" + } +} \ No newline at end of file diff --git a/_locales/ko/messages.json b/_locales/ko/messages.json index f736ce1e9..244059b51 100644 --- a/_locales/ko/messages.json +++ b/_locales/ko/messages.json @@ -1422,7 +1422,7 @@ "message": "새로운 소식 " }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Ghostery 설정 " }, "global_settings_saved": { "message": "전역 설정 저장됨" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "모든 업데이트 내용은 릴리스 노트를 참조하십시오 " + } +} \ No newline at end of file diff --git a/_locales/nl/messages.json b/_locales/nl/messages.json index 93b297064..6277417c2 100644 --- a/_locales/nl/messages.json +++ b/_locales/nl/messages.json @@ -1422,7 +1422,7 @@ "message": "Actueel" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Ghostery Instellen" }, "global_settings_saved": { "message": "Algemene Instellingen Opgeslagen" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Bekijk release notes voor alle updates" + } +} \ No newline at end of file diff --git a/_locales/pl/messages.json b/_locales/pl/messages.json index ea24b2a3a..26a605a86 100644 --- a/_locales/pl/messages.json +++ b/_locales/pl/messages.json @@ -1422,7 +1422,7 @@ "message": "Co nowego?" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Konfiguruj Ghostery" }, "global_settings_saved": { "message": "Ustawienia globalne zapisane" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Zobacz informacje o wersji dla wszystkich aktualizacji" + } +} \ No newline at end of file diff --git a/_locales/pt_BR/messages.json b/_locales/pt_BR/messages.json index e3a0186fc..6b6a14536 100644 --- a/_locales/pt_BR/messages.json +++ b/_locales/pt_BR/messages.json @@ -1422,7 +1422,7 @@ "message": "O que há de novo?" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Configurar o Ghostery" }, "global_settings_saved": { "message": "Configurações Globais Salvas" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "Ver notas de lançamento para todas as atualizações" + } +} \ No newline at end of file diff --git a/_locales/ru/messages.json b/_locales/ru/messages.json index 92f2036f1..e55c7e185 100644 --- a/_locales/ru/messages.json +++ b/_locales/ru/messages.json @@ -1422,7 +1422,7 @@ "message": "Что нового?" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "Настроить Ghostery" }, "global_settings_saved": { "message": "Глобальные настройки сохранены" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "См. примечания к выпуску для получения информации обо всех обновлениях" + } +} \ No newline at end of file diff --git a/_locales/zh_CN/messages.json b/_locales/zh_CN/messages.json index 4afab4cff..27d7201c8 100644 --- a/_locales/zh_CN/messages.json +++ b/_locales/zh_CN/messages.json @@ -1422,7 +1422,7 @@ "message": "有什么新变化？" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "设置 Ghostery" }, "global_settings_saved": { "message": "全局设置已保存" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "查看所有更新的版本说明" + } +} \ No newline at end of file diff --git a/_locales/zh_TW/messages.json b/_locales/zh_TW/messages.json index 8a044f9c0..224274813 100644 --- a/_locales/zh_TW/messages.json +++ b/_locales/zh_TW/messages.json @@ -1422,7 +1422,7 @@ "message": "最新動態。" }, "panel_help_setup": { - "message": "Set Up Ghostery" + "message": "安裝 Ghostery" }, "global_settings_saved": { "message": "全球設定已儲存" @@ -1481,5 +1481,8 @@ "content": "" } } - } -} + }, + "panel_about_release_notes": { + "message": "閱讀發佈說明以了解所有更新" + } +} \ No newline at end of file diff --git a/app/panel/components/Summary.jsx b/app/panel/components/Summary.jsx index 1420e4677..930efb2d5 100644 --- a/app/panel/components/Summary.jsx +++ b/app/panel/components/Summary.jsx @@ -396,22 +396,22 @@ class Summary extends React.Component {
diff --git a/app/panel/components/Tooltip.jsx b/app/panel/components/Tooltip.jsx index 97a6b1e5a..46cbb25ba 100644 --- a/app/panel/components/Tooltip.jsx +++ b/app/panel/components/Tooltip.jsx @@ -55,7 +55,7 @@ class Tooltip extends React.Component { */ enter = () => { this.setState({ show: true }); - if (this.props.disabled && this.props.showNotification) { + if (this.props.disabled && this.props.showNotification && this.props.alertText) { this.props.showNotification({ text: this.props.alertText, classes: 'warning', filter: 'tooltip' }); } } diff --git a/app/scss/setup.scss b/app/scss/setup.scss index 92e2f5ec8..c52ffc21c 100644 --- a/app/scss/setup.scss +++ b/app/scss/setup.scss @@ -69,6 +69,10 @@ body { } #setup-page { + //Don't show blue border on click + *:focus { + outline: none; + } #header { height: 53px; color: $white; diff --git a/src/background.js b/src/background.js index 235c189cb..967bb7cee 100644 --- a/src/background.js +++ b/src/background.js @@ -1299,23 +1299,8 @@ function initializeGhosteryModules() { if (IS_EDGE) { setCliqzModuleEnabled(hpn, false); } - cliqzStartup.then(() => { - if (!IS_EDGE) { - abtest.fetch().then(() => { - setupABTests(); - }).catch((err) => { - log('cliqzStartup abtest fetch error', err); - }); - } - }); - - // record active ping - metrics.ping('active'); - // init the CMP - cmp.fetchCMPData(); - - // Set these tasks to run every 30min + // Set these tasks to run every hour function scheduledTasks() { // auto-fetch from CMP cmp.fetchCMPData(); @@ -1328,12 +1313,27 @@ function initializeGhosteryModules() { log('Unable to reach abtest server'); }); } - - // auto-update bugs dbs - autoUpdateBugDb(); } - scheduledTasks(); - setInterval(scheduledTasks, 1800000); + + cliqzStartup.then(() => { + if (!IS_EDGE) { + abtest.fetch().then(() => { + setupABTests(); + }).catch((err) => { + log('cliqzStartup abtest fetch error', err); + }); + } + }); + + // Check CMP right away. + cmp.fetchCMPData(); + // Check CMP and ABTest every hour. + setInterval(scheduledTasks, 3600000); + + // Update db right away. + autoUpdateBugDb(); + // Schedule it to run every 30 min. + setInterval(autoUpdateBugDb, 1800000); // listen for changes to specific conf properties initializeDispatcher(); @@ -1347,6 +1347,8 @@ function initializeGhosteryModules() { button.update(tabId); }); + // record active ping + metrics.ping('active'); // initialize all tracker and surrogate DBs in parallel with Promise.all return Promise.all([ bugDb.init(globals.JUST_UPGRADED), diff --git a/src/utils/utils.js b/src/utils/utils.js index 2b1f1a381..e91c9434f 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -545,6 +545,10 @@ export function injectScript(tabId, scriptfile, cssfile, runAt) { if (cssfile) { chrome.tabs.insertCSS(tabId, { file: cssfile, runAt }, () => { + if (chrome.runtime.lastError) { + log('insertCSS error', chrome.runtime.lastError); + reject(new Error(chrome.runtime.lastError)); + } resolve(); }); } else { From 95b400f1daf3857f53d68d1c73ea98510a0e1db5 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Tue, 20 Mar 2018 13:30:58 -0400 Subject: [PATCH 2/3] Removing log from manifest --- manifest.json | 1 - 1 file changed, 1 deletion(-) diff --git a/manifest.json b/manifest.json index da6de702c..b9377eb61 100644 --- a/manifest.json +++ b/manifest.json @@ -12,7 +12,6 @@ "version_name": "8.1.1", "default_locale": "en", "description": "__MSG_short_description__", - "log": true, "icons": { "16": "app/images/icon16.png", "48": "app/images/icon48.png", From 636c05cf47c51a13f368bc5f771f92cddd08ba65 Mon Sep 17 00:00:00 2001 From: Serge Zarembsky Date: Tue, 20 Mar 2018 14:39:09 -0400 Subject: [PATCH 3/3] Added return after reject. --- src/utils/utils.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/utils/utils.js b/src/utils/utils.js index e91c9434f..b4e240eee 100644 --- a/src/utils/utils.js +++ b/src/utils/utils.js @@ -541,6 +541,7 @@ export function injectScript(tabId, scriptfile, cssfile, runAt) { if (chrome.runtime.lastError) { log('injectScript error', chrome.runtime.lastError); reject(new Error(chrome.runtime.lastError)); + return; } if (cssfile) { @@ -548,6 +549,7 @@ export function injectScript(tabId, scriptfile, cssfile, runAt) { if (chrome.runtime.lastError) { log('insertCSS error', chrome.runtime.lastError); reject(new Error(chrome.runtime.lastError)); + return; } resolve(); });