From 09d4a9aaf9acc468db6e2dc83495ca84ce7c0cee Mon Sep 17 00:00:00 2001 From: Mike Steele Date: Wed, 25 Dec 2019 18:33:04 -0500 Subject: [PATCH] v2.4.2 (#120) --- background_page/package.json | 2 +- browser_action/package.json | 2 +- content_script/package.json | 2 +- content_script/src/PopupMessageHandler.js | 44 +++++++++++++---------- content_script/src/SettingControls.js | 2 +- content_script/src/SettingsModal.js | 4 +-- manifest/package.json | 2 +- site_integrations/package.json | 2 +- 8 files changed, 33 insertions(+), 27 deletions(-) diff --git a/background_page/package.json b/background_page/package.json index c0e524a..bd719b2 100644 --- a/background_page/package.json +++ b/background_page/package.json @@ -1,6 +1,6 @@ { "name": "dual-captions-background-page", - "version": "2.4.1", + "version": "2.4.2", "description": "", "main": "./dist/index.js", "scripts": { diff --git a/browser_action/package.json b/browser_action/package.json index 7fc4177..256ad5e 100644 --- a/browser_action/package.json +++ b/browser_action/package.json @@ -1,6 +1,6 @@ { "name": "dual-captions-browser-action", - "version": "2.4.1", + "version": "2.4.2", "private": true, "dependencies": { "chai": "^4.1.2", diff --git a/content_script/package.json b/content_script/package.json index 11ba8ad..8effd5c 100644 --- a/content_script/package.json +++ b/content_script/package.json @@ -1,6 +1,6 @@ { "name": "dual-captions-content_script", - "version": "2.4.1", + "version": "2.4.2", "private": true, "dependencies": { "franc": "^4.1.0", diff --git a/content_script/src/PopupMessageHandler.js b/content_script/src/PopupMessageHandler.js index 3972777..c8b9b70 100644 --- a/content_script/src/PopupMessageHandler.js +++ b/content_script/src/PopupMessageHandler.js @@ -56,7 +56,7 @@ class PopupMessageHandler extends React.Component { }); this.getSavedUILanguage().then(uiLanguage => { if (uiLanguage) { - this.changeSetting('uiLanguage', uiLanguage); + this.changeSetting('uiLanguage', uiLanguage, false); } }).catch(err => { console.log(`Couldn't get saved UI language on mount. Error: ${err}`); @@ -65,13 +65,13 @@ class PopupMessageHandler extends React.Component { onMouseMove() { if (!this.state.settings.mouseIsActive) { - this.changeSetting('mouseIsActive', true); + this.changeSetting('mouseIsActive', true, false); } if (this.idleTimer) { window.clearTimeout(this.idleTimer); } this.idleTimer = window.setTimeout(() => { - this.changeSetting('mouseIsActive', false); + this.changeSetting('mouseIsActive', false, false); }, 2500); } @@ -188,14 +188,20 @@ class PopupMessageHandler extends React.Component { document.body.removeEventListener('keyup', this.onKeyUp); } - changeSetting(setting, value) { - this.setState(state => ({ - settings: { - ...state.settings, - [setting]: value, - settingsAreDefault: false, - }, - })); + changeSetting(setting, value, settingsAreNoLongerDefault) { + this.setState(state => { + let settingsAreDefault = state.settings.settingsAreDefault; + if (settingsAreDefault && settingsAreNoLongerDefault) { + settingsAreDefault = false; + } + return { + settings: { + ...state.settings, + [setting]: value, + settingsAreDefault, + } + }; + }); } onMessage(message, sender, sendResponse) { @@ -207,7 +213,7 @@ class PopupMessageHandler extends React.Component { // TODO - Should deprecate case 'change-language': - this.changeSetting('secondSubtitleLanguage', message.payload); + this.changeSetting('secondSubtitleLanguage', message.payload, true); break; case 'change-settings': @@ -220,22 +226,22 @@ class PopupMessageHandler extends React.Component { hideActionPanel } = message.payload; if (settings.extraSpace !== extraSpace) { - this.changeSetting('extraSpace', extraSpace); + this.changeSetting('extraSpace', extraSpace, true); } if (settings.customTextColor !== customTextColor) { - this.changeSetting('customTextColor', customTextColor); + this.changeSetting('customTextColor', customTextColor, true); } if (settings.customColorsEnabled !== customColorsEnabled) { - this.changeSetting('customColorsEnabled', customColorsEnabled); + this.changeSetting('customColorsEnabled', customColorsEnabled, true); } if (settings.smallText !== smallText) { - this.changeSetting('smallText', smallText); + this.changeSetting('smallText', smallText, true); } if (settings.hotKeyEnabled !== hotKeyEnabled) { - this.changeSetting('hotKeyEnabled', hotKeyEnabled); + this.changeSetting('hotKeyEnabled', hotKeyEnabled, true); } if (settings.hideActionPanel !== hideActionPanel) { - this.changeSetting('hideActionPanel', hideActionPanel); + this.changeSetting('hideActionPanel', hideActionPanel, true); } break; @@ -281,7 +287,7 @@ class PopupMessageHandler extends React.Component { break; case 'change-ui-language': - this.changeSetting('uiLanguage', message.payload); + this.changeSetting('uiLanguage', message.payload, true); sendResponse({ ok: true }); diff --git a/content_script/src/SettingControls.js b/content_script/src/SettingControls.js index 8685efc..d46dc39 100644 --- a/content_script/src/SettingControls.js +++ b/content_script/src/SettingControls.js @@ -294,7 +294,7 @@ class SettingControls extends React.Component { }} key={lang} onClick={() => { - settings.changeSetting('secondSubtitleLanguage', lang); + settings.changeSetting('secondSubtitleLanguage', lang, true); this.setState({ actionTooltopOpen: false }); diff --git a/content_script/src/SettingsModal.js b/content_script/src/SettingsModal.js index 1ca6f14..ed94fd7 100644 --- a/content_script/src/SettingsModal.js +++ b/content_script/src/SettingsModal.js @@ -14,7 +14,7 @@ const TextColorControl = props => { marginBottom: '16px' }; const onChange = e => { - settings.changeSetting('customTextColor', e.target.value); + settings.changeSetting('customTextColor', e.target.value, true); } return (
@@ -47,7 +47,7 @@ const CheckboxControl = props => { const isChecked = settings[settingKey]; const icon = isChecked ? : ; const onClick = () => { - settings.changeSetting(settingKey, !isChecked); + settings.changeSetting(settingKey, !isChecked, true); } return (
diff --git a/manifest/package.json b/manifest/package.json index 926f951..9e46382 100644 --- a/manifest/package.json +++ b/manifest/package.json @@ -1,6 +1,6 @@ { "name": "dual-captions-manifest-creator", - "version": "2.4.1", + "version": "2.4.2", "description": "", "main": "index.js", "scripts": { diff --git a/site_integrations/package.json b/site_integrations/package.json index 08163ac..5ea9fa8 100644 --- a/site_integrations/package.json +++ b/site_integrations/package.json @@ -1,6 +1,6 @@ { "name": "dual-captions-site-integrations", - "version": "2.4.1", + "version": "2.4.2", "description": "", "main": "./dist/index.js", "scripts": {