diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index ee20d72..a771bbb 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -27,7 +27,7 @@ community include: Examples of unacceptable behavior include: -- The use of sexualized language or imagery, and sexual attention or +- The use of erotic language or imagery, and sexual attention or advances of any kind - Trolling, insulting or derogatory comments, and personal or political attacks - Public or private harassment diff --git a/README.md b/README.md index 9a41950..750df3a 100644 --- a/README.md +++ b/README.md @@ -101,7 +101,7 @@
| Mac | Windows/Linux | Function | -| --------------------------- | ------------------------------ | ----------------------------- | +|-----------------------------|--------------------------------|-------------------------------| | ⌘ + [ | Ctrl + ← | Return to the previous page | | ⌘ + ] | Ctrl + → | Go to the next page | | ⌘ + ↑ | Ctrl + ↑ | Auto scroll to top of page | diff --git a/README_CN.md b/README_CN.md index f6f55cf..90cc1e4 100644 --- a/README_CN.md +++ b/README_CN.md @@ -100,18 +100,18 @@
-| Mac | Windows/Linux | 功能 | -| --------------------------- | ------------------------------ | ------------------ | -| ⌘ + [ | Ctrl + ← | 返回上一个页面 | -| ⌘ + ] | Ctrl + → | 去下一个页面 | +| Mac | Windows/Linux | 功能 | +|-----------------------------|--------------------------------|-----------| +| ⌘ + [ | Ctrl + ← | 返回上一个页面 | +| ⌘ + ] | Ctrl + → | 去下一个页面 | | ⌘ + ↑ | Ctrl + ↑ | 自动滚动到页面顶部 | | ⌘ + ↓ | Ctrl + ↓ | 自动滚动到页面底部 | -| ⌘ + r | Ctrl + r | 刷新页面 | -| ⌘ + w | Ctrl + w | 隐藏窗口，非退出 | -| ⌘ + - | Ctrl + - | 缩小页面 | -| ⌘ + + | Ctrl + + | 放大页面 | -| ⌘ + = | Ctrl + = | 放大页面 | -| ⌘ + 0 | Ctrl + 0 | 重置页面缩放 | +| ⌘ + r | Ctrl + r | 刷新页面 | +| ⌘ + w | Ctrl + w | 隐藏窗口，非退出 | +| ⌘ + - | Ctrl + - | 缩小页面 | +| ⌘ + + | Ctrl + + | 放大页面 | +| ⌘ + = | Ctrl + = | 放大页面 | +| ⌘ + 0 | Ctrl + 0 | 重置页面缩放 | 此外还支持双击头部进行全屏切换，拖拽头部进行移动窗口，Mac 用户支持手势方式返回和去下一页，还有其他需求，欢迎提过来。 diff --git a/bin/utils/url.ts b/bin/utils/url.ts index 8ae79f8..fff707a 100644 --- a/bin/utils/url.ts +++ b/bin/utils/url.ts @@ -20,7 +20,7 @@ export function getDomain(inputUrl: string) { i === 0 || // 'asia.com' (last remaining must be the SLD) i < ln - 2 || // TLDs only span 2 levels part.length < minLength || // 'www.cn.com' (valid TLD as second-level domain) - tlds.indexOf(part) < 0 // officialy not a TLD + tlds.indexOf(part) < 0 // officially not a TLD ) { return part; } diff --git a/script/build.sh b/script/build.sh index 242c8f9..efa91d5 100755 --- a/script/build.sh +++ b/script/build.sh @@ -68,17 +68,17 @@ do # replace package info $sd -s "${old_url}" "${url}" src-tauri/tauri.conf.json $sd -s "${old_name}" "${package_name}" src-tauri/tauri.conf.json - # echo "update ico with 32x32 pictue" + # echo "update ico with 32x32 picture" # $sd "${old_name}" "${package_name}" src-tauri/src/main.rs # for apple, need replace title if [[ "$OSTYPE" =~ ^darwin ]]; then # update icon - # if icon exsits, change icon path + # if icon exists, change icon path if [ ! -f "src-tauri/icons/${package_name}.icns" ]; then # else, replace icon to default echo "warning" - echo "icon for MacOS not exsist, will use default icon to replace it" + echo "icon for MacOS not exist, will use default icon to replace it" echo "warning" cp "src-tauri/icons/icon.icns" "src-tauri/icons/${package_name}.icns" fi @@ -86,16 +86,16 @@ do $sd -s "${old_title}" "${package_title}" src-tauri/tauri.conf.json fi - # echo "update ico with 32x32 pictue" + # echo "update ico with 32x32 picture" # cp "src-tauri/png/${package_name}_32.ico" "src-tauri/icons/icon.ico" if [[ "$OSTYPE" =~ ^linux ]]; then # update icon - # if icon exsits, change icon path + # if icon exists, change icon path if [ ! -f "src-tauri/png/${package_name}_512.png" ]; then # else, replace icon to default echo "warning" - echo "icon for linux not exsist, will use default icon to replace it" + echo "icon for linux not exist, will use default icon to replace it" echo "warning" cp "src-tauri/png/icon_256.ico" "src-tauri/png/${package_name}_256.ico" cp "src-tauri/png/icon_512.png" "src-tauri/png/${package_name}_512.png" @@ -120,8 +120,8 @@ do if [[ "$OSTYPE" =~ ^linux ]]; then npm run tauri build - mv src-tauri/target/release/bundle/deb/${package_prefix}-${package_name}*.deb output/linux/${package_title}_amd64.deb - mv src-tauri/target/release/bundle/appimage/${package_prefix}-${package_name}*.AppImage output/linux/${package_title}_amd64.AppImage + mv src-tauri/target/release/bundle/deb/${package_prefix}-"${package_name}"*.deb output/linux/"${package_title}"_amd64.deb + mv src-tauri/target/release/bundle/appimage/${package_prefix}-"${package_name}"*.AppImage output/linux/"${package_title}"_amd64.AppImage echo clear cache rm src-tauri/target/release rm -rf src-tauri/target/release/bundle @@ -131,7 +131,7 @@ do if [[ "$OSTYPE" =~ ^darwin ]]; then npm run tauri build -- --target universal-apple-darwin - mv src-tauri/target/universal-apple-darwin/release/bundle/dmg/*.dmg output/macos/${package_title}.dmg + mv src-tauri/target/universal-apple-darwin/release/bundle/dmg/*.dmg output/macos/"${package_title}".dmg echo clear cache rm -rf src-tauri/target/universal-apple-darwin rm src-tauri/target/aarch64-apple-darwin/release