Skip to content

Commit

Permalink
feat: remove built-in ime
Browse files Browse the repository at this point in the history
  • Loading branch information
baiyuanneko committed Jan 22, 2025
1 parent 1a65ce1 commit ad08e39
Show file tree
Hide file tree
Showing 14 changed files with 1 addition and 244 deletions.
9 changes: 1 addition & 8 deletions App/edit_article_meta.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
const loadIME = require("./loadIME");

const xssStrict = require("xss");

module.exports = function (i) {
Expand Down Expand Up @@ -73,13 +73,6 @@ module.exports = function (i) {

tooltip_load();

loadIME("#meta_article_title");
loadIME("#meta_article_description");
loadIME("#meta_article_createdat");
loadIME("#meta_article_updatedat");
loadIME("#meta_article_tags");
loadIME("#meta_article_filename");

if (blog["文章列表"][i]["标签"].length !== 0) {
let tempTagString = "";
for (let k = 0; k < blog["文章列表"][i]["标签"].length; k++)
Expand Down
2 changes: 0 additions & 2 deletions App/edit_friend_book.js
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ function render_friend_book_json_url_input(){
</div>
`;
loadIME("#friend_book_json_url");

document.getElementById("friend_book_json_url").value = xssStrict(blog["若友人帐来自json文件,则地址为"]);

Expand Down Expand Up @@ -121,5 +120,4 @@ ${langdata.GET_FRIEND_BOOK_DATA_FROM_EXTERNAL_LINK[lang_name]}
if (blog["友人帐页面允许评论"] === true)
document.getElementById("enableFriendBookComment").checked = true;

loadIME("#friend_book_additional_info");
};
3 changes: 0 additions & 3 deletions App/edit_page_meta.js
Original file line number Diff line number Diff line change
Expand Up @@ -54,9 +54,6 @@ module.exports = function (i) {
if (blog["页面列表"][i]["启用评论"] === true)
document.getElementById("meta_page_iscommentenabled").checked = true;

loadIME("#meta_page_title");
loadIME("#meta_page_title_menu");

document.getElementById("meta_page_title").value = xssStrict(blog["页面列表"][i]["页面标题"]);
document.getElementById("meta_page_title_menu").value = blog["页面列表"][i]["若显示在菜单中,则在菜单中显示为"];
};
55 changes: 0 additions & 55 deletions App/loadIME.js

This file was deleted.

4 changes: 0 additions & 4 deletions App/manage.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<link href="../node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="../node_modules/ipinyinjs/simple-input-method/simple-input-method.css" rel="stylesheet" />
<title>Baiyuanneko's Blog Generator</title>
</head>

Expand Down Expand Up @@ -164,9 +163,6 @@ <h5 class="modal-title"></h5>


<script src="../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="../node_modules/ipinyinjs/dict/pinyin_dict_notone.js"></script>
<script src="../node_modules/ipinyinjs/pinyinUtil.js"></script>
<script src="../node_modules/ipinyinjs/simple-input-method/simple-input-method.js"></script>
<script>
var currentPage = "article_manager";
</script>
Expand Down
14 changes: 0 additions & 14 deletions App/manage.js
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,6 @@ const tooltip_load = require("./tooltip_load.js");

const loadUniStyle = require("./loadUniStyle.js");
const ui_hook_load_finished = require("./ui_hook_load_finished.js");
const loadIME = require("./loadIME.js");
const render_preview_and_publish_page = require("./render_preview_and_publish_page.js");
const preview_and_publish = require("./preview_and_publish.js");
const enterPreviewAndPublishInterfaceOf = require("./navToSectionOfPreviewAndPublish.js");
Expand Down Expand Up @@ -164,19 +163,6 @@ function init_ui() {
}

ui_hook_load_finished();
loadIME(".form-control");
if (ipcRenderer.sendSync("ime_getCurrentStatus") === "input") {
SimpleInputMethod.isInEnglishMode = false;
}
SimpleInputMethod.callbackFuncWhenChangeEnglishMode = function (
isCurrentModeEnglishMode
) {
if (isCurrentModeEnglishMode === true) {
ipcRenderer.send("ime_setToEnglishMode");
} else {
ipcRenderer.send("ime_setToInputMode");
}
};
}

storage.has("language", (error, hasKey) => {
Expand Down
4 changes: 0 additions & 4 deletions App/markdown_editor.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@

<link href="../node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="../node_modules/ipinyinjs/simple-input-method/simple-input-method.css" rel="stylesheet" />
<title>BBG Markdown Editor</title>
</head>

Expand Down Expand Up @@ -133,9 +132,6 @@
</div>

<script src="../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="../node_modules/ipinyinjs/dict/pinyin_dict_notone.js"></script>
<script src="../node_modules/ipinyinjs/pinyinUtil.js"></script>
<script src="../node_modules/ipinyinjs/simple-input-method/simple-input-method.js"></script>
<script>
var currentPage = "markdown_editor";
</script>
Expand Down
4 changes: 0 additions & 4 deletions App/render_friend_book_list.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,5 @@ module.exports = function () {
</tr>
`);
loadIME(`#friend_book_list_${i}_name`);
loadIME(`#friend_book_list_${i}_link`);
loadIME(`#friend_book_list_${i}_description`);
loadIME(`#friend_book_list_${i}_icon`);
}
};
4 changes: 0 additions & 4 deletions App/server.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@

<link href="../node_modules/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet">
<link href="../node_modules/font-awesome/css/font-awesome.min.css" rel="stylesheet" />
<link href="../node_modules/ipinyinjs/simple-input-method/simple-input-method.css" rel="stylesheet" />
<link href="../node_modules/@xterm/xterm/css/xterm.css" rel="stylesheet" />
<title>Baiyuanneko's Blog Generator</title>
</head>
Expand Down Expand Up @@ -43,9 +42,6 @@ <h5 class="modal-title" id="terminal_emulator_dialog_title">Terminal Emulator</h
</div>

<script src="../node_modules/bootstrap/dist/js/bootstrap.bundle.min.js"></script>
<script src="../node_modules/ipinyinjs/dict/pinyin_dict_notone.js"></script>
<script src="../node_modules/ipinyinjs/pinyinUtil.js"></script>
<script src="../node_modules/ipinyinjs/simple-input-method/simple-input-method.js"></script>
<script src="../node_modules/@xterm/xterm/lib/xterm.js"></script>
<script>
var alreadyOpenedTerminal = false;
Expand Down
114 changes: 0 additions & 114 deletions App/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -327,108 +327,6 @@ function learn_more_about_version(type){
learn_more_about_version_dialog.show();
}

function open_builtin_ime_setting_dialog(){
const builtin_ime_setting_dialog = new bootstrap.Modal(document.getElementById("builtin-ime-dialog"));
document.getElementById("builtin-ime-dialog-content").innerHTML = `
<h3>${langdata.SETTING_OF_BUILTIN_IME[lang_name]}</h3>
<br />
<p>${langdata.ENABLE_BUILTIN_IME[lang_name]}</p>
<select class="form-select">
<option id="builtin_ime_enabled_auto_choose">${langdata.AUTO_CHOOSE[lang_name]}</option>
<option id="builtin_ime_enabled_true">${langdata.ENABLE[lang_name]}</option>
<option id="builtin_ime_enabled_false">${langdata.DISABLE[lang_name]}</option>
</select>
<br />
<p>${langdata.MODE[lang_name]}</p>
<select class="form-select">
<option id="builtin_ime_type_auto_choose">${langdata.AUTO_CHOOSE[lang_name]}</option>
<option id="builtin_ime_type_pinyin">${langdata.BUILTIN_IME_PATTERN_PINYIN[lang_name]}</option>
<option id="builtin_ime_type_xiaohe_doublepinyin">${langdata.BUILTIN_IME_PATTERN_XIAOHE_DOUBLEPINYIN[lang_name]}</option>
<option id="builtin_ime_type_none">${langdata.NONE[lang_name]}</option>
</select>
<br />
<p>${langdata.HINT_OF_AUTO_CHOOSE_OPTION_IN_BUILTIN_IME[lang_name]}</p>
<p><b>${langdata.BUILTIN_IME_KEYBOARD_SHORTCUT_TO_SWITCH_BETWEEN_CHINESE_AND_ENGLISH[lang_name]}</b></p>
<br />
<button class="btn btn-outline-success" id="btn_save_builtin_ime_settings"><i class="fa fa-check"></i> ${langdata.OK[lang_name]}</button>
<button class="btn btn-outline-secondary" data-bs-dismiss="modal"><i class="fa fa-ban"></i> ${langdata.CANCEL[lang_name]}</button>
`;

storage.has("builtin_ime_status", (error, hasKey) => {
if (error) {
console.error(error);
}
if (hasKey === true) {
storage.get("builtin_ime_status", (error, data) => {
if (error) {
console.error(error);
}
if (data.enabled === "auto") {
document.getElementById("builtin_ime_enabled_auto_choose").selected = true;
} else if (data.enabled === "true") {
document.getElementById("builtin_ime_enabled_true").selected = true;
} else {
document.getElementById("builtin_ime_enabled_false").selected = true;
}

if (data.ime === "auto") {
document.getElementById("builtin_ime_type_auto_choose").selected = true;
} else if (data.ime === "pinyin") {
document.getElementById("builtin_ime_type_pinyin").selected = true;
} else if (data.ime === "xiaohe_doublepinyin") {
document.getElementById("builtin_ime_type_xiaohe_doublepinyin").selected = true;
} else {
document.getElementById("builtin_ime_type_none").selected = true;
}

});
}
});

document.getElementById("btn_save_builtin_ime_settings").addEventListener("click", ()=>{
const builtin_ime_enabled_auto_choose_ui = document.getElementById("builtin_ime_enabled_auto_choose");
const builtin_ime_enabled_true_ui = document.getElementById("builtin_ime_enabled_true");
const builtin_ime_enabled_false_ui = document.getElementById("builtin_ime_enabled_false");
const builtin_ime_type_auto_choose_ui = document.getElementById("builtin_ime_type_auto_choose");
const builtin_ime_type_pinyin_ui = document.getElementById("builtin_ime_type_pinyin");
const builtin_ime_type_xiaohe_doublepinyin_ui = document.getElementById("builtin_ime_type_xiaohe_doublepinyin");
const builtin_ime_type_none_ui = document.getElementById("builtin_ime_type_none");

let builtin_ime_enabled;
let builtin_ime_type;

if(builtin_ime_enabled_auto_choose_ui.selected === true){
builtin_ime_enabled = "auto";
}else if(builtin_ime_enabled_true_ui.selected === true){
builtin_ime_enabled = "true";
}else{
builtin_ime_enabled = "false";
}

if(builtin_ime_type_auto_choose_ui.selected === true){
builtin_ime_type = "auto";
}else if(builtin_ime_type_pinyin_ui.selected === true){
builtin_ime_type = "pinyin";
}else if(builtin_ime_type_xiaohe_doublepinyin_ui.selected === true){
builtin_ime_type = "xiaohe_doublepinyin";
}else{
builtin_ime_type = "none";
}

storage.set("builtin_ime_status", {
enabled: builtin_ime_enabled,
ime: builtin_ime_type
}, (error)=>{
if(error){
console.error(error);
}
builtin_ime_setting_dialog.hide();
});
});

builtin_ime_setting_dialog.show();
}

render_language_selections();

storage.has("language", (error, hasKey) => {
Expand Down Expand Up @@ -472,17 +370,6 @@ storage.has("language", (error, hasKey) => {
}
});

storage.has("builtin_ime_status", (error, hasKey) => {
if (error) {
console.error(error);
}
if (hasKey === false) {
storage.set("builtin_ime_status", {
enabled: "auto",
ime: "auto"
});
}
});

lang_name = data.name;
document.getElementById("info-dialog-ok").innerHTML = `<i class="fa fa-check" aria-hidden="true"></i> ${langdata.OK[lang_name]}`;
Expand Down Expand Up @@ -523,7 +410,6 @@ storage.has("language", (error, hasKey) => {
<li><a class="dropdown-item" onclick="openStylesheetDialog()"><i class="fa fa-paint-brush" aria-hidden="true"></i> ${langdata.APPLICATION_STYLE_SETTING[lang_name]}</a></li>
<li><a class="dropdown-item" onclick="displayContributers()"><i class="fa fa-users" aria-hidden="true"></i> ${langdata.DISPLAY_CONTRIBUTORS[lang_name]}</a></li>
<li><a class="dropdown-item" onclick="check_update()"><i class="fa fa-refresh" aria-hidden="true"></i> ${langdata.CHECK_UPDATE[lang_name]}</a></li>
<li><a class="dropdown-item" onclick="open_builtin_ime_setting_dialog()"><i class="fa fa-keyboard-o" aria-hidden="true"></i> ${langdata.SETTING_OF_BUILTIN_IME[lang_name]}</a></li>
<li><a class="dropdown-item" onclick="open_ai_assisted_writing_setting_dialog()"><i class="fa fa-lightbulb-o" aria-hidden="true"></i> ${langdata.AI_ASSISTED_WRITING_CONFIG[lang_name]}</a></li>
<li><a class="dropdown-item" onclick="open_customize_bbg_ui_dialog()"><i class="fa fa-paw" aria-hidden="true"></i> ${langdata.SETTING_OF_CUSTOM_UI[lang_name]}</a></li>
</ul>
Expand Down
13 changes: 0 additions & 13 deletions main.js
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ app.setAboutPanelOptions({
website: appInfo.officialWebsite
});

let CurrentStatusOfIME = "en";

function openExistingSite() {
win.webContents.send("openExistingSite");
Expand Down Expand Up @@ -165,15 +164,3 @@ ipcMain.on("backToStartPageAndCreateNewSite", () => {
ipcMain.on("render_menu_again", () => {
render_menu();
});

ipcMain.on("ime_setToEnglishMode", () => {
CurrentStatusOfIME = "en";
});

ipcMain.on("ime_setToInputMode", () => {
CurrentStatusOfIME = "input";
});

ipcMain.on("ime_getCurrentStatus", (event) => {
event.returnValue = CurrentStatusOfIME;
});
14 changes: 0 additions & 14 deletions main_dev.js
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,6 @@ require("@electron/remote/main").initialize();

app.commandLine.appendSwitch("remote-debugging-port", "9541");

/** @type {string} */
let CurrentStatusOfIME = "en";
/** @type {BrowserWindow | null | undefined} */
let win;

Expand Down Expand Up @@ -56,15 +54,3 @@ const createWindow = () => {
};

app.whenReady().then(() => createWindow());

ipcMain.on("ime_setToEnglishMode", () => {
CurrentStatusOfIME = "en";
});

ipcMain.on("ime_setToInputMode", () => {
CurrentStatusOfIME = "input";
});

ipcMain.on("ime_getCurrentStatus", (event) => {
event.returnValue = CurrentStatusOfIME;
});
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,6 @@
"express": "^4.21.2",
"font-awesome": "4.7.0",
"husky": "^9.1.7",
"ipinyinjs": "https://github.com/bbg-contributors/pinyinjs.git",
"lint-staged": "^15.2.10",
"marked": "^15.0.5",
"native-prompt": "^2.1.4",
Expand Down
4 changes: 0 additions & 4 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2227,10 +2227,6 @@ ipaddr.js@1.9.1:
resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==

"ipinyinjs@https://github.com/bbg-contributors/pinyinjs.git":
version "1.0.0"
resolved "https://github.com/bbg-contributors/pinyinjs.git#6c74a4ca05dc723e58d50e535fa91fdbc3760bff"

is-alphabetical@^1.0.0:
version "1.0.4"
resolved "https://registry.yarnpkg.com/is-alphabetical/-/is-alphabetical-1.0.4.tgz#9e7d6b94916be22153745d184c298cbf986a686d"
Expand Down

0 comments on commit ad08e39

Please sign in to comment.