taigrr/wails
1
0
Fork 0
mirror of https://github.com/taigrr/wails.git synced 2026-04-02 05:08:54 -07:00
Code Issues Packages Projects Releases Wiki Activity

[mac] Update runtime to use window.wailsInvoke

Browse Source
This commit is contained in:
Lea Anthony
2021-06-03 21:01:14 +10:00
parent ac957b27cb
commit 9fdd5148ca
7 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
v2/internal/bridge/darwin.js
View File

File diff suppressed because one or more lines are too long

2
v2/internal/ffenestri/ffenestri_darwin.c
View File

@@ -983,7 +983,7 @@ void SaveDialog(struct Application *app, char *callbackID, char *title, char *fi
);
}
const char *invoke = "window.external={invoke:function(x){window.webkit.messageHandlers.external.postMessage(x);}};";
const char *invoke = "window.wailsInvoke=function(message){window.webkit.messageHandlers.external.postMessage(message);};window.wailsDrag=function(message){window.webkit.messageHandlers.windowDrag.postMessage(message);};window.wailsContextMenuMessage=function(message){window.webkit.messageHandlers.contextMenu.postMessage(message);};";
// DisableFrame disables the window frame
void DisableFrame(struct Application *app)

2
v2/internal/ffenestri/runtime_darwin.c
View File

File diff suppressed because one or more lines are too long

2
v2/internal/runtime/assets/desktop_darwin.js
View File

File diff suppressed because one or more lines are too long

6
v2/internal/runtime/js/desktop/darwin.js
View File

@@ -19,7 +19,7 @@ export const System = {
};
export function SendMessage(message) {
window.webkit.messageHandlers.external.postMessage(message);
window.wailsInvoke(message);
}
export function Init() {
@@ -32,7 +32,7 @@ export function Init() {
if (currentElement.hasAttribute('data-wails-no-drag')) {
break;
} else if (currentElement.hasAttribute('data-wails-drag')) {
window.webkit.messageHandlers.windowDrag.postMessage(null);
window.wailsDrag(null);
break;
}
currentElement = currentElement.parentElement;
@@ -59,7 +59,7 @@ export function Init() {
id: contextMenuId,
data: contextData || '',
};
window.webkit.messageHandlers.contextMenu.postMessage(JSON.stringify(message));
window.wailsContextMenuMessage(JSON.stringify(message));
}
});
}

6
v2/internal/runtime/js/runtime/bridge.js
View File

@@ -1562,6 +1562,12 @@
window.wailsInvoke = (message) => {
websocket.send(message);
};
window.wailsDrag = (message) => {
websocket.send(message);
};
window.wailsContextMenuMessage = (message) => {
websocket.send(message);
};
}
// Handles incoming websocket connections

2
v2/internal/runtime/js/runtime/package.json
View File

@@ -1,6 +1,6 @@
{
"name": "@wails/runtime",
"version": "1.3.18",
"version": "1.3.19",
"description": "Wails V2 Javascript runtime library",
"main": "main.js",
"types": "runtime.d.ts",