From 54aa9cb7d9ebb7f85d229908bf20995df6481ba2 Mon Sep 17 00:00:00 2001 From: tiddlygit-test Date: Fri, 24 Jul 2020 01:15:03 +0800 Subject: [PATCH] refactor: better name for request open --- public/listeners/index.js | 4 +-- src/components/dialog-about/index.js | 14 ++++----- src/components/dialog-add-workspace/index.js | 4 +-- src/components/dialog-preferences/index.js | 30 +++++++++---------- .../list-item-default-browser.js | 4 +-- .../list-item-default-mail-client.js | 4 +-- src/components/dialog-proxy/index.js | 18 +++++------ src/senders/index.js | 6 ++-- 8 files changed, 42 insertions(+), 42 deletions(-) diff --git a/public/listeners/index.js b/public/listeners/index.js index 327bfed5..83f42678 100755 --- a/public/listeners/index.js +++ b/public/listeners/index.js @@ -100,8 +100,8 @@ const loadListeners = () => { } }); - ipcMain.on('request-open-in-browser', (e, url) => { - shell.openExternal(url); + ipcMain.on('request-open', (e, uri) => { + shell.openExternal(uri); }); // Find In Page diff --git a/src/components/dialog-about/index.js b/src/components/dialog-about/index.js index b10bac1a..3a9465aa 100644 --- a/src/components/dialog-about/index.js +++ b/src/components/dialog-about/index.js @@ -7,7 +7,7 @@ import DialogContent from '@material-ui/core/DialogContent'; import connectComponent from '../../helpers/connect-component'; -import { requestOpenInBrowser } from '../../senders'; +import { requestOpen } from '../../senders'; const styles = (theme) => ({ icon: { @@ -81,13 +81,13 @@ const About = (props) => {
@@ -97,10 +97,10 @@ const About = (props) => { ❤ by requestOpenInBrowser('https://onetwo.ren/wiki/')} + onClick={() => requestOpen('https://onetwo.ren/wiki/')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://onetwo.ren/wiki/'); + requestOpen('https://onetwo.ren/wiki/'); }} role="link" tabIndex="0" @@ -110,10 +110,10 @@ const About = (props) => { and requestOpenInBrowser('https://atomery.com?utm_source=tiddlygit')} + onClick={() => requestOpen('https://atomery.com?utm_source=tiddlygit')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://atomery.com?utm_source=tiddlygit'); + requestOpen('https://atomery.com?utm_source=tiddlygit'); }} role="link" tabIndex="0" diff --git a/src/components/dialog-add-workspace/index.js b/src/components/dialog-add-workspace/index.js index 9c124c8f..bc5ce045 100644 --- a/src/components/dialog-add-workspace/index.js +++ b/src/components/dialog-add-workspace/index.js @@ -25,7 +25,7 @@ import { getDesktopPath, countWorkspace, getWorkspaceRemote, - requestOpenInBrowser, + requestOpen, } from '../../senders'; const graphqlClient = new GraphQLClient({ @@ -128,7 +128,7 @@ export default function AddWorkspace() { 同步到云端 {githubWikiUrl && ( - requestOpenInBrowser(githubWikiUrl)} variant="subtitle2" align="center"> + requestOpen(githubWikiUrl)} variant="subtitle2" align="center"> ({githubWikiUrl}) )} diff --git a/src/components/dialog-preferences/index.js b/src/components/dialog-preferences/index.js index 3c3e3abe..64652b57 100644 --- a/src/components/dialog-preferences/index.js +++ b/src/components/dialog-preferences/index.js @@ -57,7 +57,7 @@ import ListItemDefaultBrowser from './list-item-default-browser'; import { requestCheckForUpdates, requestClearBrowsingData, - requestOpenInBrowser, + requestOpen, requestQuit, requestRealignActiveWorkspace, requestResetPreferences, @@ -545,10 +545,10 @@ const Preferences = ({ role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://cliqz.com/en/whycliqz/adblocking')} + onClick={() => requestOpen('https://cliqz.com/en/whycliqz/adblocking')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://cliqz.com/en/whycliqz/adblocking'); + requestOpen('https://cliqz.com/en/whycliqz/adblocking'); }} > Cliqz @@ -580,10 +580,10 @@ const Preferences = ({ role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://darkreader.org/')} + onClick={() => requestOpen('https://darkreader.org/')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://darkreader.org/'); + requestOpen('https://darkreader.org/'); }} > Dark Reader @@ -859,10 +859,10 @@ const Preferences = ({ role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://github.com/atomery/webcatalog/wiki/How-to-Enable-Notifications-in-Web-Apps')} + onClick={() => requestOpen('https://github.com/atomery/webcatalog/wiki/How-to-Enable-Notifications-in-Web-Apps')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://github.com/atomery/webcatalog/wiki/How-to-Enable-Notifications-in-Web-Apps'); + requestOpen('https://github.com/atomery/webcatalog/wiki/How-to-Enable-Notifications-in-Web-Apps'); }} > Learn more @@ -1023,10 +1023,10 @@ const Preferences = ({ role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://groups.google.com/a/chromium.org/d/msg/security-dev/mB2KJv_mMzM/ddMteO9RjXEJ')} + onClick={() => requestOpen('https://groups.google.com/a/chromium.org/d/msg/security-dev/mB2KJv_mMzM/ddMteO9RjXEJ')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://groups.google.com/a/chromium.org/d/msg/security-dev/mB2KJv_mMzM/ddMteO9RjXEJ'); + requestOpen('https://groups.google.com/a/chromium.org/d/msg/security-dev/mB2KJv_mMzM/ddMteO9RjXEJ'); }} > Learn more @@ -1053,7 +1053,7 @@ const Preferences = ({ - requestOpenInBrowser('https://github.com/tiddly-gittly/TiddlyGit-Desktop/blob/master/PrivacyPolicy.md')}> + requestOpen('https://github.com/tiddly-gittly/TiddlyGit-Desktop/blob/master/PrivacyPolicy.md')}> @@ -1243,7 +1243,7 @@ const Preferences = ({ - requestOpenInBrowser('https://webcatalogapp.com?utm_source=singlebox_app')}> + requestOpen('https://webcatalogapp.com?utm_source=singlebox_app')}> )} secondary="Run Web Apps like Real Apps" @@ -1251,7 +1251,7 @@ const Preferences = ({ - requestOpenInBrowser('https://singleboxapp.com?utm_source=singlebox_app')}> + requestOpen('https://singleboxapp.com?utm_source=singlebox_app')}> )} secondary="All Your Apps in One Single Window" @@ -1259,7 +1259,7 @@ const Preferences = ({ - requestOpenInBrowser('https://translatiumapp.com?utm_source=singlebox_app')}> + requestOpen('https://translatiumapp.com?utm_source=singlebox_app')}> )} secondary="Translate Any Languages like a Pro" @@ -1279,12 +1279,12 @@ const Preferences = ({ - requestOpenInBrowser('https://tiddlygitapp.com?utm_source=tiddlygit_app')}> + requestOpen('https://tiddlygitapp.com?utm_source=tiddlygit_app')}> - requestOpenInBrowser('https://atomery.com/support?app=tiddlygit&utm_source=tiddlygit_app')}> + requestOpen('https://atomery.com/support?app=tiddlygit&utm_source=tiddlygit_app')}> diff --git a/src/components/dialog-preferences/list-item-default-browser.js b/src/components/dialog-preferences/list-item-default-browser.js index 043d2d69..4a41fd75 100644 --- a/src/components/dialog-preferences/list-item-default-browser.js +++ b/src/components/dialog-preferences/list-item-default-browser.js @@ -9,7 +9,7 @@ import ChevronRightIcon from '@material-ui/icons/ChevronRight'; import connectComponent from '../../helpers/connect-component'; -import { requestOpenInBrowser } from '../../senders'; +import { requestOpen } from '../../senders'; const ListItemDefaultBrowser = () => { const [isDefault, setIsDefault] = useState(false); @@ -69,7 +69,7 @@ const ListItemDefaultBrowser = () => { if (isWindows10) { return ( // https://docs.microsoft.com/en-us/windows/uwp/launch-resume/launch-settings-app - requestOpenInBrowser('ms-settings:defaultapps')}> + requestOpen('ms-settings:defaultapps')}> {sharedListItemText} diff --git a/src/components/dialog-preferences/list-item-default-mail-client.js b/src/components/dialog-preferences/list-item-default-mail-client.js index 386f9105..73417fa2 100644 --- a/src/components/dialog-preferences/list-item-default-mail-client.js +++ b/src/components/dialog-preferences/list-item-default-mail-client.js @@ -9,7 +9,7 @@ import ChevronRightIcon from '@material-ui/icons/ChevronRight'; import connectComponent from '../../helpers/connect-component'; -import { requestOpenInBrowser } from '../../senders'; +import { requestOpen } from '../../senders'; const ListItemDefaultMailClient = () => { const [isDefault, setIsDefault] = useState(false); @@ -65,7 +65,7 @@ const ListItemDefaultMailClient = () => { if (isWindows10) { return ( // https://docs.microsoft.com/en-us/windows/uwp/launch-resume/launch-settings-app - requestOpenInBrowser('ms-settings:defaultapps')}> + requestOpen('ms-settings:defaultapps')}> diff --git a/src/components/dialog-proxy/index.js b/src/components/dialog-proxy/index.js index 79d5623a..9189984d 100644 --- a/src/components/dialog-proxy/index.js +++ b/src/components/dialog-proxy/index.js @@ -17,7 +17,7 @@ import { save, } from '../../state/dialog-proxy/actions'; -import { requestOpenInBrowser } from '../../senders'; +import { requestOpen } from '../../senders'; const styles = (theme) => ({ root: { @@ -94,10 +94,10 @@ const DialogProxy = (props) => { role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://www.npmjs.com/package/proxy-agent')} + onClick={() => requestOpen('https://www.npmjs.com/package/proxy-agent')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://www.npmjs.com/package/proxy-agent'); + requestOpen('https://www.npmjs.com/package/proxy-agent'); }} > Learn more @@ -123,10 +123,10 @@ const DialogProxy = (props) => { role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://www.electronjs.org/docs/api/session#sessetproxyconfig')} + onClick={() => requestOpen('https://www.electronjs.org/docs/api/session#sessetproxyconfig')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://www.electronjs.org/docs/api/session#sessetproxyconfig'); + requestOpen('https://www.electronjs.org/docs/api/session#sessetproxyconfig'); }} > Learn more @@ -165,10 +165,10 @@ const DialogProxy = (props) => { role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://en.wikipedia.org/wiki/Proxy_auto-config')} + onClick={() => requestOpen('https://en.wikipedia.org/wiki/Proxy_auto-config')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://en.wikipedia.org/wiki/Proxy_auto-config'); + requestOpen('https://en.wikipedia.org/wiki/Proxy_auto-config'); }} > Learn more @@ -194,10 +194,10 @@ const DialogProxy = (props) => { role="link" tabIndex={0} className={classes.link} - onClick={() => requestOpenInBrowser('https://www.electronjs.org/docs/api/session#sessetproxyconfig')} + onClick={() => requestOpen('https://www.electronjs.org/docs/api/session#sessetproxyconfig')} onKeyDown={(e) => { if (e.key !== 'Enter') return; - requestOpenInBrowser('https://www.electronjs.org/docs/api/session#sessetproxyconfig'); + requestOpen('https://www.electronjs.org/docs/api/session#sessetproxyconfig'); }} > Learn more diff --git a/src/senders/index.js b/src/senders/index.js index 19e97a5a..dd497fa4 100644 --- a/src/senders/index.js +++ b/src/senders/index.js @@ -11,9 +11,9 @@ export const requestCreateSubWiki = ( ) => ipcRenderer.invoke('create-sub-wiki', newFolderPath, folderName, mainWikiToLink, onlyLink); export const ensureWikiExist = (wikiPath: string, shouldBeMainWiki: boolean) => ipcRenderer.invoke('ensure-wiki-exist', wikiPath, shouldBeMainWiki); -export const requestOpenInBrowser = url => ipcRenderer.send('request-open-in-browser', url); -export const requestShowMessageBox = (message, type) => ipcRenderer.send('request-show-message-box', message, type); -export const requestLoadUrl = (url, id) => ipcRenderer.send('request-load-url', url, id); +export const requestOpen = (uri: string) => ipcRenderer.send('request-open', uri); +export const requestShowMessageBox = (message: string, type: string) => ipcRenderer.send('request-show-message-box', message, type); +export const requestLoadUrl = (url: string, id: string) => ipcRenderer.send('request-load-url', url, id); export const requestGoHome = () => ipcRenderer.send('request-go-home'); export const requestGoBack = () => ipcRenderer.send('request-go-back');