From b9bf9307b7278c61fce037a33e86ae663e801e91 Mon Sep 17 00:00:00 2001
From: xiangyu <3170102889@zju.edu.cn>
Date: Fri, 12 Aug 2022 15:26:48 +0800
Subject: [PATCH] resolve: #109 menu order
---
addon/chrome/content/overlay.xul | 62 ++++++++++++++++----------------
src/events.ts | 1 +
src/views.ts | 15 ++++++++
3 files changed, 48 insertions(+), 30 deletions(-)
diff --git a/addon/chrome/content/overlay.xul b/addon/chrome/content/overlay.xul
index 26d9557..14b2c1d 100644
--- a/addon/chrome/content/overlay.xul
+++ b/addon/chrome/content/overlay.xul
@@ -56,54 +56,56 @@
\ No newline at end of file
diff --git a/src/events.ts b/src/events.ts
index 19527b5..85d2852 100644
--- a/src/events.ts
+++ b/src/events.ts
@@ -152,6 +152,7 @@ class AddonEvents extends AddonBase {
this.resetState();
this.initWorkspaceTab();
+ this._Addon.views.keppDefaultMenuOrder();
this._Addon.views.switchRealMenuBar(true);
this._Addon.views.switchKey(true);
diff --git a/src/views.ts b/src/views.ts
index 6c928f6..2204540 100644
--- a/src/views.ts
+++ b/src/views.ts
@@ -43,6 +43,21 @@ class AddonViews extends AddonBase {
_document.getElementById("better-notes-menu").hidden = true;
}
+ keppDefaultMenuOrder() {
+ const fileMenu = document.querySelector("#menu_FilePopup");
+ const editMenu = document.querySelector("#menu_EditPopup");
+ const exit = fileMenu.querySelector("#menu_FileQuitItem");
+ // exit.remove();
+ const prefs = editMenu.querySelector("#menu_preferences");
+ // prefs.remove();
+ for (const ele of fileMenu.querySelectorAll(".menu-betternotes")) {
+ exit.before(ele);
+ }
+ for (const ele of editMenu.querySelectorAll(".menu-betternotes")) {
+ prefs.before(ele);
+ }
+ }
+
switchRealMenuBar(hidden: boolean) {
// We only handle hide. The show will be handled by the ZoteroStandalone.switchMenuType
document