From bd43fc9d7aa649ff6845a303d164b1b27544742b Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 21 Dec 2022 21:47:31 -0500 Subject: [PATCH 1/4] Bump version to 0.3.1-pre.2 --- app/settings/manifest.js | 12 ++++++++++++ package.json | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/settings/manifest.js b/app/settings/manifest.js index 97323c8..b9a4bb4 100644 --- a/app/settings/manifest.js +++ b/app/settings/manifest.js @@ -483,6 +483,18 @@ alphabetical order within each category.` // }}}2 // Changelog {{{1 setting_definitions.push( + { + "tab": future_i18n("What's new?"), + "group": `Version 0.3.1${brplain('20XX-XX-XX')}`, + 'group_html':true, + "type": "description", + "text": ( +` +` + ), + + }, { "tab": future_i18n("What's new?"), "group": `Version 0.3.0${brplain('2022-12-09')}`, diff --git a/package.json b/package.json index 09f8fd9..82043a2 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "tabfern", - "version": "0.3.0", + "version": "0.3.1-pre.2", "description": "Google Chrome extension for displaying, saving, and managing tabs", "main": "src/view/main.js", "directories": { From b2f260afaa86de400f6108994ebe9fed186685a3 Mon Sep 17 00:00:00 2001 From: Chris White Date: Wed, 21 Dec 2022 21:54:29 -0500 Subject: [PATCH 2/4] Use `Id` as a suffix instead of `ID`. For names in TabFern code, standardize on suffix `Id` rather than `ID` or `id`. --- CONTRIBUTING.md | 6 ++++++ app/bg/background.js | 30 +++++++++++++++--------------- app/win/main_tl.js | 6 +++--- vendor/common.js | 2 +- 4 files changed, 25 insertions(+), 19 deletions(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e4459d6..f95a338 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -140,6 +140,12 @@ A good example is [this commit](https://github.com/cxw42/TabFern/commit/3ac0f274 for more documentation of the available options. - Edit the values appropriately. +### Miscellaneous + +- If you add a name ending with `id` (in any case), and it's not all + upper-case, please spell it `Id` rather than `ID` or `id`. That will help + avoid bugs like #304. Thanks! + ## Notes about dependencies The following dev dependencies are listed in `package.json` but **not used** diff --git a/app/bg/background.js b/app/bg/background.js index f60a333..63eaccd 100644 --- a/app/bg/background.js +++ b/app/bg/background.js @@ -18,7 +18,7 @@ const S = require('common/setting-definitions'); // in app/ /// The module exports, for use in command-line debugging let me = { - viewWindowID: undefined, // the chrome.windows ID of our view + viewWindowId: undefined, // the chrome.windows ID of our view loadView: undefined, }; @@ -46,8 +46,8 @@ me.loadView = function loadView() // However, Firefox does support windows.update with focused. }, function(win) { - me.viewWindowID = win.id; - console.log('TabFern new View ID: ' + me.viewWindowID.toString()); + me.viewWindowId = win.id; + console.log('TabFern new View ID: ' + me.viewWindowId.toString()); chrome.windows.update(win.id, {focused:true}, ignore_chrome_error); }); } //loadView() @@ -63,8 +63,8 @@ function moveTabFernViewToWindow(reference_cwin) function clip(x, lo, hi) { if(hi [, anything else] } // For responses, response:true is also included. -const MSG_GET_VIEW_WIN_ID = 'getViewWindowID'; +const MSG_GET_VIEW_WIN_ID = 'getViewWindowId'; const MSG_EDIT_TAB_NOTE = 'editTabNote'; ////////////////////////////////////////////////////////////////////////// }}}1 From 1277ea29ffb7a1b92cd4c88ebcd084d23288ddb2 Mon Sep 17 00:00:00 2001 From: Chris White Date: Sun, 25 Dec 2022 14:22:41 -0500 Subject: [PATCH 3/4] Typo fixes in onTabReplaced() [bugfix] (#304) --- app/settings/manifest.js | 1 + app/win/main_tl.js | 6 +----- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/app/settings/manifest.js b/app/settings/manifest.js index b9a4bb4..5f24307 100644 --- a/app/settings/manifest.js +++ b/app/settings/manifest.js @@ -490,6 +490,7 @@ setting_definitions.push( "type": "description", "text": ( `
    +
  • Bugfixes ${issue(304)}
` ), diff --git a/app/win/main_tl.js b/app/win/main_tl.js index 7c844a6..6bc37bf 100644 --- a/app/win/main_tl.js +++ b/app/win/main_tl.js @@ -2742,15 +2742,11 @@ function onTabReplaced(addedTabId, removedTabId) { log.info(`Tab being replaced: ${removedTabId} -> ${addedTabId}`); - const errmsg = M.react_onTabReplaced(addedTabID, removedTabId); + const errmsg = M.react_onTabReplaced(addedTabId, removedTabId); if(typeof(errmsg) === 'string') { log.warn(`Could not replace ${removedTabId} with ${addedTabId}: ${errmsg}`); return; - } else { - log.debug({ - [`Tab replacement ${removedTabId}->${addedTabId}: new value`]:tab_val - }); } } //onTabReplaced From 98e8924eafdca3678af7cd055ce8445b1cd929ad Mon Sep 17 00:00:00 2001 From: Chris White Date: Sun, 25 Dec 2022 14:24:47 -0500 Subject: [PATCH 4/4] onTabReplaced: upgrade errors from warnings to exceptions For consistency with the other onTab*() handlers. --- app/win/main_tl.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/app/win/main_tl.js b/app/win/main_tl.js index 6bc37bf..4ba1204 100644 --- a/app/win/main_tl.js +++ b/app/win/main_tl.js @@ -2745,8 +2745,7 @@ function onTabReplaced(addedTabId, removedTabId) const errmsg = M.react_onTabReplaced(addedTabId, removedTabId); if(typeof(errmsg) === 'string') { - log.warn(`Could not replace ${removedTabId} with ${addedTabId}: ${errmsg}`); - return; + throw new Error(`Could not replace ${removedTabId} with ${addedTabId}: ${errmsg}`); } } //onTabReplaced