diff --git a/app/src/mobile/index.ts b/app/src/mobile/index.ts
index 4e8d8c042..4651723d4 100644
--- a/app/src/mobile/index.ts
+++ b/app/src/mobile/index.ts
@@ -72,11 +72,11 @@ class App {
initAssets();
fetchPost("/api/setting/getCloudUser", {}, userResponse => {
window.siyuan.user = userResponse.data;
- loadPlugins(siyuanApp);
fetchPost("/api/system/getEmojiConf", {}, emojiResponse => {
window.siyuan.emojis = emojiResponse.data as IEmoji[];
initFramework();
initRightMenu();
+ loadPlugins(siyuanApp);
openChangelog();
});
});
diff --git a/app/src/plugin/API.ts b/app/src/plugin/API.ts
index efc853955..c29aa0c9d 100644
--- a/app/src/plugin/API.ts
+++ b/app/src/plugin/API.ts
@@ -5,6 +5,7 @@ import {Dialog} from "../dialog";
import {MenuItem} from "../menus/Menu";
import {Menu as SiyuanMenu} from "../menus/Menu";
import {fetchGet, fetchPost, fetchSyncPost} from "../util/fetch";
+import {isMobile} from "../util/functions";
export class Menu {
private menu: SiyuanMenu;
@@ -58,6 +59,7 @@ export class Menu {
return;
}
this.menu.fullscreen(position);
+ this.menu.element.style.zIndex = "310";
}
close() {
@@ -74,4 +76,5 @@ export const API = {
Plugin: Plugin,
Dialog,
Menu,
+ isMobile
};
diff --git a/app/src/plugin/index.ts b/app/src/plugin/index.ts
index ec5b6b5b9..a2ef641e4 100644
--- a/app/src/plugin/index.ts
+++ b/app/src/plugin/index.ts
@@ -1,6 +1,7 @@
import {App} from "../index";
import {EventBus} from "./EventBus";
import {fetchPost} from "../util/fetch";
+import {isMobile, isWindow} from "../util/functions";
export class Plugin {
public i18n: IObject;
@@ -28,12 +29,22 @@ export class Plugin {
callback: (evt: MouseEvent) => void
}) {
const iconElement = document.createElement("div");
- iconElement.className = "toolbar__item b3-tooltips b3-tooltips__sw";
- iconElement.setAttribute("aria-label", options.title);
- iconElement.setAttribute("data-menu", "true");
- iconElement.innerHTML = options.icon.startsWith("icon") ? `` : options.icon;
- iconElement.addEventListener("click", options.callback);
- document.querySelector("#" + (options.position === "right" ? "barSearch" : "drag")).before(iconElement);
+ if (isMobile()) {
+ iconElement.className = "b3-menu__item";
+ iconElement.setAttribute("aria-label", options.title);
+ iconElement.setAttribute("data-menu", "true");
+ iconElement.innerHTML = (options.icon.startsWith("icon") ? `` : options.icon) +
+ ``;
+ iconElement.addEventListener("click", options.callback);
+ document.querySelector("#menuAbout").after(iconElement);
+ } else if (!isWindow()) {
+ iconElement.className = "toolbar__item b3-tooltips b3-tooltips__sw";
+ iconElement.setAttribute("aria-label", options.title);
+ iconElement.setAttribute("data-menu", "true");
+ iconElement.innerHTML = options.icon.startsWith("icon") ? `` : options.icon;
+ iconElement.addEventListener("click", options.callback);
+ document.querySelector("#" + (options.position === "right" ? "barSearch" : "drag")).before(iconElement);
+ }
return iconElement;
}