Also update electron-builder to 22.14.4.
@ -167,7 +167,7 @@ Ext.define('Hamsket.ux.WebView',{
,partition: 'persist:' + me.record.get('type') + '_' + me.id.replace('tab_', '')
,allowtransparency: 'on'
,autosize: 'on'
,webpreferences: 'enableRemoteModule=yes,spellcheck=yes' //,nativeWindowOpen=true
,webpreferences: 'enableRemoteModule=yes,spellcheck=yes,contextIsolation=no' //,nativeWindowOpen=true
//,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled
,userAgent: me.getUserAgent()
,preload: './resources/js/hamsket-service-api.js'
@ -114,7 +114,8 @@ function createWindow () {
partition: 'persist:hamsket',
nodeIntegration: true,
webviewTag: true,
enableRemoteModule: true
enableRemoteModule: true,
contextIsolation: false
}
});
@ -80,9 +80,9 @@
"dist": "npm run repack"
},
"dependencies": {
"@electron/remote": "^1.0.2",
"@electron/remote": "^2.0.1",
"auto-launch": "^5.0.5",
"electron-context-menu": "^2.3.0",
"electron-contextmenu-wrapper": "^5.0.0",
"electron-store": "^5.0.0",
"mime": "^2.4.4",
"tmp": "^0.1.0"
@ -92,8 +92,8 @@
"chai": "^4.2.0",
"crowdin": "^3.4.2",
"csvjson": "^5.1.0",
"electron": "^10.3.0",
"electron-builder": "^22.9.1",
"electron": "^13.5.1",
"electron-builder": "^22.14.4",
"mocha": "^7.1.1",
"shx": "^0.3.2",
"spectron": "^10.0.1"
@ -3,7 +3,7 @@
*/
const { ipcRenderer, remote } = require('electron');
const contextMenu = require('electron-context-menu');
const { ContextMenuBuilder, ContextMenuListener } = require('electron-contextmenu-wrapper');
/**
* Make the Hamsket API available via a global "hamsket" variable.
@ -53,11 +53,9 @@ window.hamsket.isInViewport = function(node) {
rect.top < (window.innerHeight || document.documentElement.clientHeight);
};
contextMenu({
window: remote.getCurrentWebContents(),
showCopyImageAddress: true,
showSaveImage: false,
showSaveImageAs: true
window.hamsket.contextMenuBuilder = new ContextMenuBuilder();
window.hamsket.contextMenuListener = new ContextMenuListener(function(event, info) {
window.hamsket.contextMenuBuilder.showPopupMenu(info);