Browse Source

Revert sandboxing until we discover why window.open no longer works.

pull/3202/head
TheGoddessInari 5 years ago
parent
commit
aff217eded
No known key found for this signature in database
GPG Key ID: 1209B1B7632D69A
  1. 8
      app/ux/WebView.js

8
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: 'sandbox=yes' //,nativeWindowOpen=true ,webpreferences: '' //,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'
@ -371,7 +371,7 @@ Ext.define('Hamsket.ux.WebView',{
case 'flowdock': case 'flowdock':
if ( e.disposition === 'new-window' ) { if ( e.disposition === 'new-window' ) {
e.preventDefault(); e.preventDefault();
require('electron').shell.openExternal(e.url); require('electron').remote.shell.openExternal(e.url);
} }
return; return;
default: default:
@ -381,7 +381,7 @@ Ext.define('Hamsket.ux.WebView',{
const protocol = require('url').parse(e.url).protocol; const protocol = require('url').parse(e.url).protocol;
if (protocol === 'http:' || protocol === 'https:' || protocol === 'mailto:') { if (protocol === 'http:' || protocol === 'https:' || protocol === 'mailto:') {
e.preventDefault(); e.preventDefault();
require('electron').shell.openExternal(e.url); require('electron').remote.shell.openExternal(e.url);
} }
}); });
@ -965,7 +965,7 @@ Ext.define('Hamsket.ux.WebView',{
return version || require('electron').remote.require('process').versions['chrome']; return version || require('electron').remote.require('process').versions['chrome'];
} }
,getElectronVersion() { ,getElectronVersion() {
return require('process').versions['electron']; return require('electron').require('process').versions['electron'];
} }
,getAppVersion() { ,getAppVersion() {
return require('electron').remote.app.getVersion(); return require('electron').remote.app.getVersion();

Loading…
Cancel
Save