Browse Source

Update electron to 13.5.1, and switch back to electron-contextmenu-wrapper.

Also update electron-builder to 22.14.4.
pull/3202/head
TheGoddessInari 4 years ago
parent
commit
1df5645d9e
No known key found for this signature in database
GPG Key ID: 1209B1B7632D69A
  1. 2
      app/ux/WebView.js
  2. 3
      electron/main.js
  3. 9528
      package-lock.json
  4. 8
      package.json
  5. 10
      resources/js/hamsket-service-api.js

2
app/ux/WebView.js

@ -167,7 +167,7 @@ Ext.define('Hamsket.ux.WebView',{
,partition: 'persist:' + me.record.get('type') + '_' + me.id.replace('tab_', '') ,partition: 'persist:' + me.record.get('type') + '_' + me.id.replace('tab_', '')
,allowtransparency: 'on' ,allowtransparency: 'on'
,autosize: '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 //,disablewebsecurity: 'on' // Disabled because some services (Like Google Drive) dont work with this enabled
,userAgent: me.getUserAgent() ,userAgent: me.getUserAgent()
,preload: './resources/js/hamsket-service-api.js' ,preload: './resources/js/hamsket-service-api.js'

3
electron/main.js

@ -114,7 +114,8 @@ function createWindow () {
partition: 'persist:hamsket', partition: 'persist:hamsket',
nodeIntegration: true, nodeIntegration: true,
webviewTag: true, webviewTag: true,
enableRemoteModule: true enableRemoteModule: true,
contextIsolation: false
} }
}); });

9528
package-lock.json generated

File diff suppressed because it is too large Load Diff

8
package.json

@ -80,9 +80,9 @@
"dist": "npm run repack" "dist": "npm run repack"
}, },
"dependencies": { "dependencies": {
"@electron/remote": "^1.0.2", "@electron/remote": "^2.0.1",
"auto-launch": "^5.0.5", "auto-launch": "^5.0.5",
"electron-context-menu": "^2.3.0", "electron-contextmenu-wrapper": "^5.0.0",
"electron-store": "^5.0.0", "electron-store": "^5.0.0",
"mime": "^2.4.4", "mime": "^2.4.4",
"tmp": "^0.1.0" "tmp": "^0.1.0"
@ -92,8 +92,8 @@
"chai": "^4.2.0", "chai": "^4.2.0",
"crowdin": "^3.4.2", "crowdin": "^3.4.2",
"csvjson": "^5.1.0", "csvjson": "^5.1.0",
"electron": "^10.3.0", "electron": "^13.5.1",
"electron-builder": "^22.9.1", "electron-builder": "^22.14.4",
"mocha": "^7.1.1", "mocha": "^7.1.1",
"shx": "^0.3.2", "shx": "^0.3.2",
"spectron": "^10.0.1" "spectron": "^10.0.1"

10
resources/js/hamsket-service-api.js

@ -3,7 +3,7 @@
*/ */
const { ipcRenderer, remote } = require('electron'); 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. * 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); rect.top < (window.innerHeight || document.documentElement.clientHeight);
}; };
contextMenu({ window.hamsket.contextMenuBuilder = new ContextMenuBuilder();
window: remote.getCurrentWebContents(), window.hamsket.contextMenuListener = new ContextMenuListener(function(event, info) {
showCopyImageAddress: true, window.hamsket.contextMenuBuilder.showPopupMenu(info);
showSaveImage: false,
showSaveImageAs: true
}); });

Loading…
Cancel
Save