Przeglądaj źródła

:art: fix https://github.com/siyuan-note/siyuan/issues/6022

Vanessa 2 lat temu
rodzic
commit
7c9afcdfe1
1 zmienionych plików z 6 dodań i 5 usunięć
  1. 6 5
      app/src/protyle/toolbar/index.ts

+ 6 - 5
app/src/protyle/toolbar/index.ts

@@ -1079,9 +1079,9 @@ export class Toolbar {
         this.range = getEditorRange(nodeElement);
         this.range = getEditorRange(nodeElement);
         const id = nodeElement.getAttribute("data-node-id");
         const id = nodeElement.getAttribute("data-node-id");
         let oldHtml = nodeElement.outerHTML;
         let oldHtml = nodeElement.outerHTML;
-        let html = "";
-        Constants.CODE_LANGUAGES.forEach((item, index) => {
-            html += `<div class="b3-list-item${index === 0 ? " b3-list-item--focus" : ""}">${item}</div>`;
+        let html = `<div class="b3-list-item b3-list-item--focus">${window.siyuan.languages.clear}</div>`;
+        Constants.CODE_LANGUAGES.forEach((item) => {
+            html += `<div class="b3-list-item">${item}</div>`;
         });
         });
         this.subElement.style.width = "";
         this.subElement.style.width = "";
         this.subElement.style.padding = "";
         this.subElement.style.padding = "";
@@ -1097,7 +1097,8 @@ export class Toolbar {
             }
             }
             upDownHint(this.subElement.lastElementChild.lastElementChild as HTMLElement, event);
             upDownHint(this.subElement.lastElementChild.lastElementChild as HTMLElement, event);
             if (event.key === "Enter") {
             if (event.key === "Enter") {
-                languageElement.textContent = this.subElement.querySelector(".b3-list-item--focus").textContent;
+                const activeText = this.subElement.querySelector(".b3-list-item--focus").textContent;
+                languageElement.textContent = activeText === window.siyuan.languages.clear ? "" : activeText;
                 localStorage.setItem(Constants.LOCAL_CODELANG, languageElement.textContent);
                 localStorage.setItem(Constants.LOCAL_CODELANG, languageElement.textContent);
                 const editElement = getContenteditableElement(nodeElement);
                 const editElement = getContenteditableElement(nodeElement);
                 const lineNumber = nodeElement.getAttribute("linenumber");
                 const lineNumber = nodeElement.getAttribute("linenumber");
@@ -1161,7 +1162,7 @@ export class Toolbar {
             if (!listElement) {
             if (!listElement) {
                 return;
                 return;
             }
             }
-            languageElement.textContent = listElement.textContent;
+            languageElement.textContent = listElement.textContent === window.siyuan.languages.clear ? "" : listElement.textContent;
             localStorage.setItem(Constants.LOCAL_CODELANG, languageElement.textContent);
             localStorage.setItem(Constants.LOCAL_CODELANG, languageElement.textContent);
             const nodeElement = hasClosestBlock(languageElement);
             const nodeElement = hasClosestBlock(languageElement);
             if (nodeElement) {
             if (nodeElement) {