Ruh Roh!
The Great Suspender failed to start. Perhaps you are using an incompatible version of chrome?
-Try to restart the extension. If the problem persists, ask for help on the GitHub project page.
+Try to restart the extension. If the problem persists, ask for help on the GitHub project page.
You can recover lost tabs from the session management page.
diff --git a/src/css/donate.css b/src/css/donate.css deleted file mode 100644 index 4fb39061..00000000 --- a/src/css/donate.css +++ /dev/null @@ -1,107 +0,0 @@ -.btn { - background: #3477db; - color: #fff; - border-radius: 3px; - height: 40px; - line-height: 40px; - padding: 0 20px; - display: inline-block; - border: 0; - font-size: 14px; - font-weight: 500; - cursor: pointer; - - min-width: 80px; - text-align: center; -} -.btn:hover { - background: #5c9dfe; - text-decoration: none; -} -.donateButtons { - overflow: hidden; -} -.donateButtons > * { - font-family: system-ui, -apple-system, BlinkMacSystemFont, 'Segoe UI', - Helvetica, Arial, sans-serif, 'Apple Color Emoji', 'Segoe UI Emoji', - 'Segoe UI Symbol'; - margin: 0 7px 0 0; - float: left; -} -.donateButtons > *:last-child { - margin: 0; -} - -.donationToggle { - margin-top: 15px; -} - -#dudePopup { - display: none; - position: fixed; - width: 90px; - left: 30px; - bottom: -240px; - cursor: default; -} -#dudePopup.poppedup { - display: block !important; - animation-name: slideToTop; - animation-duration: 1s; - animation-timing-function: ease; - animation-iteration-count: 1; - animation-direction: normal; - animation-delay: 0.5s; - animation-play-state: running; - animation-fill-mode: forwards; -} - -.donateBubble { - display: none; - width: 365px; - padding: 15px 10px; - background: #fff; - border-radius: 4px; - bottom: 35px; - left: 133px; - position: fixed; - text-align: center; - box-shadow: 0 1px 3px rgba(0, 0, 0, 0.12), 0 1px 2px rgba(0, 0, 0, 0.24); - opacity: 0; - cursor: default; -} -.donateBubble:before { - content: ''; - position: absolute; - top: 19px; - left: -14px; - border-style: solid; - border-width: 15px 15px 15px 0; - border-color: transparent #fff; - display: block; - width: 0; - filter: drop-shadow(-2px 0px 0 rgba(0, 0, 0, 0.1)); -} -.donateBubble .donateButtons { - display: flex; - justify-content: center; - margin-bottom: 10px; -} -.donateBubble.fadeIn { - display: block !important; - animation: fadein 0.7s; - animation-fill-mode: forwards; - animation-delay: 1.5s; -} -@keyframes slideToTop { - 0% { - bottom: -240px; - } - 100% { - bottom: 10px; - z-index: 1000000; - } -} -#donatedSection { - display:none; -} \ No newline at end of file diff --git a/src/js/about.js b/src/js/about.js index 80e7036f..82f3d2bb 100644 --- a/src/js/about.js +++ b/src/js/about.js @@ -9,56 +9,10 @@ return; } - function toggleNag(hideNag) { - gsStorage.setOptionAndSync(gsStorage.NO_NAG, hideNag); - gsAnalytics.reportEvent('Donations', 'HidePopupManual', hideNag); - } - - function loadDonateButtons(responseText) { - document.getElementById('donateButtons').innerHTML = responseText; - - var bitcoinBtn = document.getElementById('bitcoinBtn'); - var patreonBtn = document.getElementById('patreonBtn'); - var paypalBtn = document.getElementById('paypalBtn'); - - bitcoinBtn.innerHTML = chrome.i18n.getMessage('js_donate_bitcoin'); - patreonBtn.innerHTML = chrome.i18n.getMessage('js_donate_patreon'); - paypalBtn.setAttribute('value', chrome.i18n.getMessage('js_donate_paypal')); - - bitcoinBtn.onclick = function() { - gsAnalytics.reportEvent('Donations', 'Click', 'coinbase'); - }; - patreonBtn.onclick = function() { - gsAnalytics.reportEvent('Donations', 'Click', 'patreon'); - }; - paypalBtn.onclick = function() { - gsAnalytics.reportEvent('Donations', 'Click', 'paypal'); - }; - - document.getElementById('alreadyDonatedToggle').onclick = function() { - toggleNag(true); - window.location.reload(); - }; - document.getElementById('donateAgainToggle').onclick = function() { - toggleNag(false); - window.location.reload(); - }; - } - gsUtils.documentReadyAndLocalisedAsPromsied(document).then(function() { var versionEl = document.getElementById('aboutVersion'); versionEl.innerHTML = 'v' + chrome.runtime.getManifest().version; - if (gsStorage.getOption(gsStorage.NO_NAG)) { - document.getElementById('donateSection').style.display = 'none'; - document.getElementById('donatedSection').style.display = 'block'; - } - - var request = new XMLHttpRequest(); - request.onload = () => loadDonateButtons(request.responseText); - request.open('GET', 'support.html', true); - request.send(); - //hide incompatible sidebar items if in incognito mode if (chrome.extension.inIncognitoContext) { Array.prototype.forEach.call( diff --git a/src/js/background.js b/src/js/background.js index 08a789fa..5e28eaaa 100644 --- a/src/js/background.js +++ b/src/js/background.js @@ -3,7 +3,7 @@ * The Great Suspender * Copyright (C) 2017 Dean Oemcke * Available under GNU GENERAL PUBLIC LICENSE v2 - * http://github.com/deanoemcke/thegreatsuspender + * http://github.com/greatsuspender/thegreatsuspender * ༼ つ ◕_◕ ༽つ */ var tgs = (function() { @@ -29,7 +29,6 @@ var tgs = (function() { const STATE_UNLOADED_URL = 'unloadedUrl'; const STATE_HISTORY_URL_TO_REMOVE = 'historyUrlToRemove'; const STATE_SET_AUTODISCARDABLE = 'setAutodiscardable'; - const STATE_SHOW_NAG = 'showNag'; const STATE_SUSPEND_REASON = 'suspendReason'; // 1=auto-suspend, 2=manual-suspend, 3=discarded const STATE_SCROLL_POS = 'scrollPos'; @@ -652,16 +651,8 @@ var tgs = (function() { } function checkForTriggerUrls(tab, url) { - // test for special case of a successful donation - if (url.indexOf('greatsuspender.github.io/thanks.html') > 0) { - gsStorage.setOptionAndSync(gsStorage.NO_NAG, true); - gsAnalytics.reportEvent('Donations', 'HidePopupAuto', true); - chrome.tabs.update(tab.id, { - url: chrome.extension.getURL('thanks.html'), - }); - - // test for a save of keyboard shortcuts (chrome://extensions/shortcuts) - } else if (url === 'chrome://extensions/shortcuts') { + // test for a save of keyboard shortcuts (chrome://extensions/shortcuts) + if (url === 'chrome://extensions/shortcuts') { _triggerHotkeyUpdate = true; } } @@ -880,7 +871,6 @@ var tgs = (function() { tab.id, STATE_DISABLE_UNSUSPEND_ON_RELOAD ); - let showNag = tgs.getTabStatePropForTabId(tab.id, tgs.STATE_SHOW_NAG); clearTabStateForTabId(tab.id); if (isCurrentFocusedTab(tab)) { @@ -898,7 +888,7 @@ var tgs = (function() { const quickInit = gsStorage.getOption(gsStorage.DISCARD_AFTER_SUSPEND) && !tab.active; gsSuspendedTab - .initTab(tab, tabView, { quickInit, showNag }) + .initTab(tab, tabView, { quickInit }) .catch(error => { gsUtils.warning(tab.id, error); }) @@ -1853,7 +1843,6 @@ var tgs = (function() { STATE_SET_AUTODISCARDABLE, STATE_SUSPEND_REASON, STATE_SCROLL_POS, - STATE_SHOW_NAG, getTabStatePropForTabId, setTabStatePropForTabId, diff --git a/src/js/contentscript.js b/src/js/contentscript.js index eee6bba7..e02e29a4 100644 --- a/src/js/contentscript.js +++ b/src/js/contentscript.js @@ -3,7 +3,7 @@ * The Great Suspender * Copyright (C) 2017 Dean Oemcke * Available under GNU GENERAL PUBLIC LICENSE v2 - * http://github.com/deanoemcke/thegreatsuspender + * http://github.com/greatsuspender/thegreatsuspender * ლ(ಠ益ಠლ) */ (function() { diff --git a/src/js/gsAnalytics.js b/src/js/gsAnalytics.js index c338e09e..1615526c 100644 --- a/src/js/gsAnalytics.js +++ b/src/js/gsAnalytics.js @@ -17,7 +17,7 @@ var gsAnalytics = (function() { function initAsPromised() { return new Promise(function(resolve) { try { - ga('create', 'UA-52338347-2', 'auto'); + ga('create', 'UA-167314577-2', 'auto'); ga('set', 'checkProtocolTask', function() {}); ga('require', 'displayfeatures'); } catch (e) { diff --git a/src/js/gsStorage.js b/src/js/gsStorage.js index 14adfa98..1fb7bb0a 100755 --- a/src/js/gsStorage.js +++ b/src/js/gsStorage.js @@ -107,7 +107,7 @@ var gsStorage = { } continue; } - // If donations are disabled locally, then ensure we disable them on synced profile + // If nags are disabled locally, then ensure we disable them on synced profile if ( key === gsStorage.NO_NAG && shouldSyncSettings && @@ -179,7 +179,7 @@ var gsStorage = { Object.keys(remoteSettings).forEach(function(key) { var remoteSetting = remoteSettings[key]; - // If donations are disabled locally, then ensure we disable them on synced profile + // If nags are disabled locally, then ensure we disable them on synced profile if (key === gsStorage.NO_NAG) { if (remoteSetting.newValue === false) { return false; // don't process this key diff --git a/src/js/gsSuspendedTab.js b/src/js/gsSuspendedTab.js index b2c5000c..095a69a5 100644 --- a/src/js/gsSuspendedTab.js +++ b/src/js/gsSuspendedTab.js @@ -3,7 +3,7 @@ var gsSuspendedTab = (function() { 'use strict'; - async function initTab(tab, tabView, { showNag, quickInit }) { + async function initTab(tab, tabView, { quickInit }) { if (!tabView) { gsUtils.warning( tab.id, @@ -55,20 +55,6 @@ var gsSuspendedTab = (function() { const isLowContrastFavicon = faviconMeta.isDark; setTheme(tabView.document, theme, isLowContrastFavicon); - // Set showNag - if ( - !options[gsStorage.NO_NAG] && - (showNag === undefined || showNag === null) - ) { - //show dude and donate link (randomly 1 of 20 times) - showNag = Math.random() > 0.95; - } - tgs.setTabStatePropForTabId(tab.id, tgs.STATE_SHOW_NAG, showNag); - - if (showNag) { - queueDonationPopup(tabView.window, tabView.document, tab.active, tab.id); - } - // Set command const suspensionToggleHotkey = await tgs.getSuspensionToggleHotkey(); setCommand(tabView.document, suspensionToggleHotkey); @@ -206,37 +192,6 @@ var gsSuspendedTab = (function() { reasonMsgEl.innerHTML = reason; } - function queueDonationPopup(_window, _document, tabActive, tabId) { - const donationPopupFocusListener = function(e) { - if (e && e.target && e.target.visibilityState === 'hidden') { - return; - } - const options = gsStorage.getSettings(); - const showNag = - tgs.getTabStatePropForTabId(tabId, tgs.STATE_SHOW_NAG) && - !options[gsStorage.NO_NAG]; - const dudeEl = _document.getElementById('dudePopup'); - const showingNag = - dudeEl !== null && dudeEl.classList.contains('poppedup'); - - if (showNag && !showingNag) { - loadDonationPopupTemplate(_document); - } else if (!showNag && showingNag) { - hideDonationPopup(_document); - } - }; - - _window.addEventListener('visibilitychange', donationPopupFocusListener); - if (tabActive) { - donationPopupFocusListener(); - } - } - - function hideDonationPopup(_document) { - _document.getElementById('dudePopup').classList.remove('poppedup'); - _document.getElementById('donateBubble').classList.remove('fadeIn'); - } - async function getPreviewUri(suspendedUrl) { const originalUrl = gsUtils.getOriginalUrl(suspendedUrl); const preview = await gsIndexedDb.fetchPreviewImage(originalUrl); @@ -395,62 +350,6 @@ var gsSuspendedTab = (function() { _document.getElementsByTagName('body')[0].appendChild(toastEl); } - function loadDonationPopupTemplate(_document) { - const popupEl = _document.createElement('div'); - popupEl.innerHTML = _document.getElementById('donateTemplate').innerHTML; - - const cssEl = popupEl.querySelector('#donateCss'); - const imgEl = popupEl.querySelector('#dudePopup'); - const bubbleEl = popupEl.querySelector('#donateBubble'); - // set display to 'none' to prevent TFOUC - imgEl.style.display = 'none'; - bubbleEl.style.display = 'none'; - gsUtils.localiseHtml(bubbleEl); - - const headEl = _document.getElementsByTagName('head')[0]; - const bodyEl = _document.getElementsByTagName('body')[0]; - headEl.appendChild(cssEl); - bodyEl.appendChild(imgEl); - bodyEl.appendChild(bubbleEl); - - const request = new XMLHttpRequest(); - request.onload = () => { - loadDonateButtonsHtml(_document, request.responseText); - }; - request.open('GET', 'support.html', true); - request.send(); - - _document.getElementById('dudePopup').classList.add('poppedup'); - _document.getElementById('donateBubble').classList.add('fadeIn'); - } - - function loadDonateButtonsHtml(_document, responseText) { - _document.getElementById('donateButtons').innerHTML = responseText; - _document.getElementById('bitcoinBtn').innerHTML = chrome.i18n.getMessage( - 'js_donate_bitcoin' - ); - _document.getElementById('patreonBtn').innerHTML = chrome.i18n.getMessage( - 'js_donate_patreon' - ); - _document - .getElementById('paypalBtn') - .setAttribute('value', chrome.i18n.getMessage('js_donate_paypal')); - try { - const gsAnalytics = chrome.extension.getBackgroundPage().gsAnalytics; - _document.getElementById('bitcoinBtn').onclick = function() { - gsAnalytics.reportEvent('Donations', 'Click', 'coinbase'); - }; - _document.getElementById('patreonBtn').onclick = function() { - gsAnalytics.reportEvent('Donations', 'Click', 'patreon'); - }; - _document.getElementById('paypalBtn').onclick = function() { - gsAnalytics.reportEvent('Donations', 'Click', 'paypal'); - }; - } catch (error) { - gsUtils.warning(error); - } - } - function cleanUrl(urlStr) { // remove scheme if (urlStr.indexOf('//') > 0) { diff --git a/src/js/gsTabCheckManager.js b/src/js/gsTabCheckManager.js index bb00a9fd..8ac98490 100644 --- a/src/js/gsTabCheckManager.js +++ b/src/js/gsTabCheckManager.js @@ -278,10 +278,11 @@ var gsTabCheckManager = (function() { // If tab is a file:// tab and file is blocked then unsuspend tab if (!gsSession.isFileUrlsAccessAllowed()) { - const originalUrl = gsUtils.getOriginalUrl(tab.url); + const url = tab.url || tab.pendingUrl; + const originalUrl = gsUtils.getOriginalUrl(url); if (originalUrl && originalUrl.indexOf('file') === 0) { gsUtils.log(tab.id, QUEUE_ID, 'Unsuspending blocked local file tab.'); - await unsuspendSuspendedTab(tab); + await gsChrome.tabsUpdate(tab.id, { url: originalUrl }); requeue(DEFAULT_TAB_CHECK_REQUEUE_DELAY, { refetchTab: true }); return; } @@ -351,11 +352,6 @@ var gsTabCheckManager = (function() { return reloadOk; } - async function unsuspendSuspendedTab(tab) { - const originalUrl = gsUtils.getOriginalUrl(tab.url); - await gsChrome.tabsUpdate(tab.id, { url: originalUrl }); - } - function ensureSuspendedTabVisible(tabView) { if (!tabView) { return false; diff --git a/src/js/gsUtils.js b/src/js/gsUtils.js index 6b32e216..3b025b3a 100644 --- a/src/js/gsUtils.js +++ b/src/js/gsUtils.js @@ -131,9 +131,8 @@ var gsUtils = { //tests for non-standard web pages. does not check for suspended pages! isSpecialTab: function(tab) { - var url = tab.url; - - if (gsUtils.isSuspendedUrl(url, true)) { + const url = tab.url || tab.pendingUrl; + if (gsUtils.isSuspendedTab(tab, true)) { return false; } // Careful, suspended urls start with "chrome-extension://" @@ -150,7 +149,8 @@ var gsUtils = { }, isFileTab: function(tab) { - if (tab.url.indexOf('file') === 0) { + const url = tab.url || tab.pendingUrl; + if (url.indexOf('file') === 0) { return true; } return false; @@ -167,9 +167,10 @@ var gsUtils = { //does not include suspended pages! isInternalTab: function(tab) { + const url = tab.url || tab.pendingUrl; var isLocalExtensionPage = - tab.url.indexOf('chrome-extension://' + chrome.runtime.id) === 0; - return isLocalExtensionPage && !gsUtils.isSuspendedUrl(tab.url); + url.indexOf('chrome-extension://' + chrome.runtime.id) === 0; + return isLocalExtensionPage && !gsUtils.isSuspendedTab(tab); }, isProtectedPinnedTab: function(tab) { @@ -202,11 +203,14 @@ var gsUtils = { }, isSuspendedTab: function(tab, looseMatching) { - return gsUtils.isSuspendedUrl(tab.url, looseMatching); + const url = tab.url || tab.pendingUrl; + return gsUtils.isSuspendedUrl(url, looseMatching); }, isSuspendedUrl: function(url, looseMatching) { - if (looseMatching) { + if (!url) { + return false; + } else if (looseMatching) { return url.indexOf('suspended.html') > 0; } else { return url.indexOf(chrome.extension.getURL('suspended.html')) === 0; diff --git a/src/js/recovery.js b/src/js/recovery.js index f373c50f..887ebad6 100644 --- a/src/js/recovery.js +++ b/src/js/recovery.js @@ -41,12 +41,13 @@ for (var i = 0; i < childLinks.length; i++) { const element = childLinks[i]; - const url = gsUtils.isSuspendedTab(tabToRemove) - ? gsUtils.getOriginalUrl(tabToRemove.url) - : tabToRemove.url; + const url = tabToRemove.url || tabToRemove.pendingUrl; + const originalUrl = gsUtils.isSuspendedUrl(url) + ? gsUtils.getOriginalUrl(url) + : url; if ( - element.getAttribute('data-url') === url || + element.getAttribute('data-url') === originalUrl || element.getAttribute('data-tabId') == tabToRemove.id ) { // eslint-disable-line eqeqeq diff --git a/src/js/thanks.js b/src/js/thanks.js deleted file mode 100644 index 9bae74b2..00000000 --- a/src/js/thanks.js +++ /dev/null @@ -1,16 +0,0 @@ -/*global chrome, gsAnalytics, gsUtils */ -(function(global) { - 'use strict'; - - try { - chrome.extension.getBackgroundPage().tgs.setViewGlobals(global); - } catch (e) { - window.setTimeout(() => window.location.reload(), 1000); - return; - } - - gsUtils.documentReadyAndLocalisedAsPromsied(document).then(function() { - //do nothing - }); - gsAnalytics.reportPageView('thanks.html'); -})(this); diff --git a/src/js/updated.js b/src/js/updated.js index 6e7b279f..e4eef7fc 100644 --- a/src/js/updated.js +++ b/src/js/updated.js @@ -15,8 +15,8 @@ } gsUtils.documentReadyAndLocalisedAsPromsied(document).then(function() { - var versionEl = document.getElementById('updatedVersion'); - versionEl.innerHTML = 'v' + chrome.runtime.getManifest().version; + // var versionEl = document.getElementById('updatedVersion'); + // versionEl.innerHTML = 'v' + chrome.runtime.getManifest().version; document.getElementById('sessionManagerLink').onclick = function(e) { e.preventDefault(); diff --git a/src/manifest.json b/src/manifest.json index 612e3748..4b476be0 100644 --- a/src/manifest.json +++ b/src/manifest.json @@ -1,7 +1,7 @@ { "name": "__MSG_ext_extension_name__", "description": "__MSG_ext_extension_description__", - "version": "7.1.4", + "version": "7.1.6", "default_locale": "en", "permissions": [ "tabs", diff --git a/src/support.html b/src/support.html deleted file mode 100644 index 495e0363..00000000 --- a/src/support.html +++ /dev/null @@ -1,11 +0,0 @@ -Patreon - - - -Crypto \ No newline at end of file diff --git a/src/suspended.html b/src/suspended.html index d6fb9685..15830aa1 100644 --- a/src/suspended.html +++ b/src/suspended.html @@ -18,15 +18,6 @@
-
- 
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-