From a470246d672dca5f6a88812b6f15bc6e27662f25 Mon Sep 17 00:00:00 2001 From: fofolee Date: Wed, 8 Apr 2020 00:22:14 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BD=BF=E7=94=A8utools=E8=87=AA=E5=B8=A6api?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E6=B5=8F=E8=A7=88=E5=99=A8=E5=9C=B0=E5=9D=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- preload.js | 21 +++------------------ 1 file changed, 3 insertions(+), 18 deletions(-) diff --git a/preload.js b/preload.js index 3d8abe3..838e5bc 100644 --- a/preload.js +++ b/preload.js @@ -127,21 +127,6 @@ pwd = () => } }); -chromeUrl = () => - new Promise((reslove, reject) => { - if (isWin) { - reslove(getAddr()); - } else { - var cmd = `osascript -e 'tell application "Google Chrome" - get URL of active tab of window 1 - end tell'` - exec(cmd, (err, stdout, stderr) => { - if (err) reject(stderr) - reslove(stdout.trim()); - }); - } -}); - special = async cmd => { // 判断是否 windows 系统 if (cmd.includes('{{isWin}}')) { @@ -161,9 +146,9 @@ special = async cmd => { cmd = cmd.replace(/\{\{pwd\}\}/mg, repl) } // 获取 Chrome 当前链接 - if (cmd.includes('{{ChromeUrl}}')) { - let repl = await chromeUrl(); - cmd = cmd.replace(/\{\{ChromeUrl\}\}/mg, repl) + if (cmd.includes('{{BrowserUrl}}')) { + let repl = utools.getCurrentBrowserUrl(); + cmd = cmd.replace(/\{\{BrowserUrl\}\}/mg, repl) } // 获取剪切板的文本 if (cmd.includes('{{ClipText}}')) {