Skip to content

Commit 508eb93

Browse files
Vanessa219Vanessa219
committed
♻️ #15347 
1 parent c88f996 commit 508eb93

33 files changed

Lines changed: 111 additions & 108 deletions

‎app/src/block/popover.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,7 +242,7 @@ const hidePopover = (event: MouseEvent & { path: HTMLElement[] }) => {
242242
if (!popoverTargetElement && linkElement && linkElement.getAttribute("data-href")?.startsWith("siyuan://blocks")) {
243243
popoverTargetElement = linkElement;
244244
}
245-
if (!popoverTargetElement || (popoverTargetElement && window.siyuan.menus.menu.data && (window.siyuan.menus.menu.data === popoverTargetElement))) {
245+
if (!popoverTargetElement || (popoverTargetElement && window.siyuan.menus.menu.data && window.siyuan.menus.menu.data === popoverTargetElement)) {
246246
// 移动到弹窗的 loading 元素上，但经过 settimeout 后 loading 已经被移除了
247247
// https://ld246.com/article/1673596577519/comment/1673767749885#comments
248248
let targetElement = target;
@@ -356,7 +356,7 @@ const getTarget = (event: MouseEvent & { target: HTMLElement }, aElement: false
356356
};
357357

358358
export const showPopover = async (app: App, showRef = false) => {
359-
if (!popoverTargetElement || (window.siyuan.menus.menu.data && (window.siyuan.menus.menu.data === popoverTargetElement))) {
359+
if (!popoverTargetElement || (window.siyuan.menus.menu.data && window.siyuan.menus.menu.data === popoverTargetElement)) {
360360
return;
361361
}
362362
let refDefs: IRefDefs[] = [];

‎app/src/card/makeCard.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ export const makeCard = (app: App, ids: string[]) => {
7171
dialog.element.setAttribute("data-key", Constants.DIALOG_MAKECARD);
7272
dialog.element.addEventListener("click", (event) => {
7373
let target = event.target as HTMLElement;
74-
while (target && (target !== dialog.element)) {
74+
while (target && target !== dialog.element) {
7575
const type = target.getAttribute("data-type");
7676
if (type === "create") {
7777
let msgId = "";

‎app/src/config/util/snippets.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,7 @@ export const openSnippets = () => {
114114
dialog.element.setAttribute("data-key", Constants.DIALOG_SNIPPETS);
115115
dialog.element.addEventListener("click", (event) => {
116116
let target = event.target as HTMLElement;
117-
while (target && (target !== dialog.element)) {
117+
while (target && target !== dialog.element) {
118118
if (target.id === "addCodeSnippetCSS" || target.id === "addCodeSnippetJS") {
119119
target.parentElement.insertAdjacentHTML("afterend", genSnippet({
120120
type: target.id === "addCodeSnippetCSS" ? "css" : "js",

‎app/src/dialog/confirmDialog.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ export const confirmDialog = (title: string, text: string,
2525
dialog.element.addEventListener("click", (event) => {
2626
let target = event.target as HTMLElement;
2727
const isDispatch = typeof event.detail === "string";
28-
while (target && (target !== dialog.element) || isDispatch) {
28+
while (target && target !== dialog.element || isDispatch) {
2929
if (target.id === "cancelDialogConfirmBtn" || (isDispatch && event.detail=== "Escape")) {
3030
if (cancel) {
3131
cancel(dialog);

‎app/src/layout/Wnd.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export class Wnd {
220220
return;
221221
}
222222
it.classList.remove("layout-tab-bars--drag");
223-
if ((newTabHeaderElement !== oldTabHeaderElement) &&
223+
if (newTabHeaderElement !== oldTabHeaderElement &&
224224
((oldTabHeaderElement.classList.contains("item--pin") && newTabHeaderElement.classList.contains("item--pin")) ||
225225
(!oldTabHeaderElement.classList.contains("item--pin") && !newTabHeaderElement.classList.contains("item--pin")))) {
226226
const rect = newTabHeaderElement.getClientRects()[0];
@@ -816,7 +816,7 @@ export class Wnd {
816816
if (item.headElement.classList.contains("item--focus")) {
817817
let latestHeadElement: HTMLElement;
818818
Array.from(item.headElement.parentElement.children).forEach((headItem: HTMLElement) => {
819-
if ((headItem !== item.headElement) &&
819+
if (headItem !== item.headElement &&
820820
headItem.style.maxWidth !== "0px" // 不对比已移除但还在动画效果中的元素 https://github.com/siyuan-note/siyuan/issues/7878
821821
) {
822822
if (!latestHeadElement) {

‎app/src/layout/dock/Backlink.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -278,7 +278,7 @@ export class Backlink extends Model {
278278
this.setFocus();
279279
let target = event.target as HTMLElement;
280280
while (target && !target.isEqualNode(this.element)) {
281-
if (target.classList.contains("block__icon") && (target.parentElement.parentElement === this.element)) {
281+
if (target.classList.contains("block__icon") && target.parentElement.parentElement === this.element) {
282282
const type = target.getAttribute("data-type");
283283
switch (type) {
284284
case "refresh":
@@ -433,7 +433,7 @@ export class Backlink extends Model {
433433
if (svgElement.classList.contains("b3-list-item__arrow--open")) {
434434
svgElement.classList.remove("b3-list-item__arrow--open");
435435
this.editors.find((item, index) => {
436-
if (item.protyle.block.rootID === docId && liElement.nextElementSibling && (item.protyle.element === liElement.nextElementSibling)) {
436+
if (item.protyle.block.rootID === docId && liElement.nextElementSibling && item.protyle.element === liElement.nextElementSibling) {
437437
item.destroy();
438438
this.editors.splice(index, 1);
439439
liElement.nextElementSibling.remove();

‎app/src/layout/dock/Outline.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ export class Outline extends Model {
178178
break;
179179
}
180180
break;
181-
} else if (this.blockId && ((target === this.headerElement.nextElementSibling) || target.classList.contains("block__icons"))) {
181+
} else if (this.blockId && (target === this.headerElement.nextElementSibling || target.classList.contains("block__icons"))) {
182182
openFileById({
183183
app: options.app,
184184
id: this.blockId,

‎app/src/layout/dock/index.ts‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,13 @@ export class Dock {
186186
const targetItem = hasClosestByClassName(moveEvent.target as HTMLElement, "dock__item") ||
187187
hasClosestByClassName(moveEvent.target as HTMLElement, "dock__items") as HTMLElement ||
188188
hasClosestByClassName(moveEvent.target as HTMLElement, "dock__item--space") as HTMLElement;
189-
if (targetItem && selectItem && (targetItem === selectItem)) {
189+
if (targetItem && selectItem && targetItem === selectItem) {
190190
if (selectItem.classList.contains("dock__item--space")) {
191191
const selectRect = selectItem.getBoundingClientRect();
192192
if (selectItem.parentElement.id === "dockBottom") {
193193
if (moveEvent.clientX < selectRect.right && moveEvent.clientX > selectRect.right - 40) {
194194
const lastFirstElement = selectItem.nextElementSibling.firstElementChild;
195-
if (lastFirstElement && (lastFirstElement === item)) {
195+
if (lastFirstElement && lastFirstElement === item) {
196196
moveItem.classList.add("fn__none");
197197
} else {
198198
moveItem.classList.remove("fn__none");
@@ -202,7 +202,7 @@ export class Dock {
202202
} else {
203203
if (moveEvent.clientY < selectRect.bottom && moveEvent.clientY > selectRect.bottom - 40) {
204204
const lastFirstElement = selectItem.nextElementSibling.firstElementChild;
205-
if (lastFirstElement && (lastFirstElement === item)) {
205+
if (lastFirstElement && lastFirstElement === item) {
206206
moveItem.classList.add("fn__none");
207207
} else {
208208
moveItem.classList.remove("fn__none");
@@ -211,7 +211,7 @@ export class Dock {
211211
}
212212
}
213213
} else if (selectItem.classList.contains("dock__item--pin")) {
214-
if (item.nextElementSibling && (item.nextElementSibling === selectItem)) {
214+
if (item.nextElementSibling && item.nextElementSibling === selectItem) {
215215
moveItem.classList.add("fn__none");
216216
} else {
217217
moveItem.classList.remove("fn__none");
@@ -221,14 +221,14 @@ export class Dock {
221221
const selectRect = selectItem.getBoundingClientRect();
222222
if (selectItem.parentElement.parentElement.id === "dockBottom") {
223223
if (selectRect.left + selectRect.width / 2 > moveEvent.clientX) {
224-
if (item.nextElementSibling && (item.nextElementSibling === selectItem)) {
224+
if (item.nextElementSibling && item.nextElementSibling === selectItem) {
225225
moveItem.classList.add("fn__none");
226226
} else {
227227
moveItem.classList.remove("fn__none");
228228
selectItem.before(moveItem);
229229
}
230230
} else {
231-
if (item.previousElementSibling && (item.previousElementSibling === selectItem)) {
231+
if (item.previousElementSibling && item.previousElementSibling === selectItem) {
232232
moveItem.classList.add("fn__none");
233233
} else {
234234
moveItem.classList.remove("fn__none");
@@ -237,14 +237,14 @@ export class Dock {
237237
}
238238
} else {
239239
if (selectRect.top + selectRect.height / 2 > moveEvent.clientY) {
240-
if (item.nextElementSibling && (item.nextElementSibling === selectItem)) {
240+
if (item.nextElementSibling && item.nextElementSibling === selectItem) {
241241
moveItem.classList.add("fn__none");
242242
} else {
243243
moveItem.classList.remove("fn__none");
244244
selectItem.before(moveItem);
245245
}
246246
} else {
247-
if (item.previousElementSibling && (item.previousElementSibling === selectItem)) {
247+
if (item.previousElementSibling && item.previousElementSibling === selectItem) {
248248
moveItem.classList.add("fn__none");
249249
} else {
250250
moveItem.classList.remove("fn__none");
@@ -267,7 +267,7 @@ export class Dock {
267267
return;
268268
}
269269
if (!targetItem || targetItem.style.position === "fixed" || (targetItem === item) || targetItem.id === "dockMoveItem") {
270-
if (targetItem && (targetItem === item)) {
270+
if (targetItem && targetItem === item) {
271271
moveItem.classList.add("fn__none");
272272
}
273273
return;

‎app/src/layout/util.ts‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -857,17 +857,17 @@ export const addResize = (obj: Layout | Wnd) => {
857857
if (previousNowSize < 8 || nextNowSize < 8) {
858858
return;
859859
}
860-
if (window.siyuan.layout.leftDock && (window.siyuan.layout.leftDock.layout.element === previousElement) &&
860+
if (window.siyuan.layout.leftDock && window.siyuan.layout.leftDock.layout.element === previousElement &&
861861
previousNowSize < getMinSize(previousElement) &&
862862
// https://github.com/siyuan-note/siyuan/issues/10506
863863
previousNowSize < previousSize) {
864864
return;
865865
}
866-
if (window.siyuan.layout.rightDock && (window.siyuan.layout.rightDock.layout.element === nextElement) &&
866+
if (window.siyuan.layout.rightDock && window.siyuan.layout.rightDock.layout.element === nextElement &&
867867
nextNowSize < getMinSize(nextElement) && nextNowSize < nextSize) {
868868
return;
869869
}
870-
if (window.siyuan.layout.bottomDock && (window.siyuan.layout.bottomDock.layout.element === nextElement) &&
870+
if (window.siyuan.layout.bottomDock && window.siyuan.layout.bottomDock.layout.element === nextElement &&
871871
nextNowSize < 64 && nextNowSize < nextSize) {
872872
return;
873873
}

‎app/src/menus/Menu.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ export class Menu {
4242
}
4343
const subMenuElement = itemElement.querySelector(".b3-menu__submenu") as HTMLElement;
4444
this.element.querySelectorAll(".b3-menu__item--show").forEach((item) => {
45-
if (!item.contains(itemElement) && (item !== itemElement) && !itemElement.contains(item)) {
45+
if (!item.contains(itemElement) && item !== itemElement && !itemElement.contains(item)) {
4646
item.classList.remove("b3-menu__item--show");
4747
}
4848
});

0 commit comments

Comments
 (0)