Browse Source

Fixes #243

Only in Windows
pull/291/merge
Ramiro Saenz 9 years ago
parent
commit
4d4e1b4876
  1. 47
      app/ux/WebView.js
  2. 7
      electron/main.js

47
app/ux/WebView.js

@ -55,8 +55,38 @@ Ext.define('Rambox.ux.WebView',{
badgetextchange: me.onBadgeTextChange badgetextchange: me.onBadgeTextChange
} }
,clickEvent: 'dblclick' ,clickEvent: 'dblclick'
,menu: [ ,menu: {
plain: true
,items: [
{ {
xtype: 'toolbar'
,items: [
{
xtype: 'segmentedbutton'
,allowToggle: false
,flex: 1
,items: [
{
text: 'Back'
,glyph: 'xf053@FontAwesome'
,flex: 1
,scope: me
,handler: me.goBack
}
,{
text: 'Foward'
,glyph: 'xf054@FontAwesome'
,iconAlign: 'right'
,flex: 1
,scope: me
,handler: me.goForward
}
]
}
]
}
,'-'
,{
text: 'Reload' text: 'Reload'
,glyph: 'xf021@FontAwesome' ,glyph: 'xf021@FontAwesome'
,scope: me ,scope: me
@ -78,6 +108,7 @@ Ext.define('Rambox.ux.WebView',{
} }
] ]
} }
}
,listeners: { ,listeners: {
afterrender: me.onAfterRender afterrender: me.onAfterRender
} }
@ -260,4 +291,18 @@ Ext.define('Rambox.ux.WebView',{
btn.setText(Ext.String.toggle(btn.text, 'Go Online', 'Go Offline')); btn.setText(Ext.String.toggle(btn.text, 'Go Online', 'Go Offline'));
btn.offline ? localStorage.setItem('offline_'+me.id.replace('tab_', ''), true) : localStorage.removeItem('offline_'+me.id.replace('tab_', '')); btn.offline ? localStorage.setItem('offline_'+me.id.replace('tab_', ''), true) : localStorage.removeItem('offline_'+me.id.replace('tab_', ''));
} }
,goBack: function() {
var me = this;
var webview = me.down('component').el.dom;
webview.goBack();
}
,goForward: function() {
var me = this;
var webview = me.down('component').el.dom;
webview.goForward();
}
}); });

7
electron/main.js

@ -150,6 +150,13 @@ function createWindow () {
event.preventDefault(); event.preventDefault();
}); });
mainWindow.on('app-command', (e, cmd) => {
// Navigate the window back when the user hits their mouse back button
if ( cmd === 'browser-backward' ) mainWindow.webContents.executeJavaScript('Ext.cq1("app-main").getActiveTab().goBack();');
// Navigate the window forward when the user hits their mouse forward button
if ( cmd === 'browser-forward' ) mainWindow.webContents.executeJavaScript('Ext.cq1("app-main").getActiveTab().goForward();');
})
// Emitted when the window is closed. // Emitted when the window is closed.
mainWindow.on('close', function(e) { mainWindow.on('close', function(e) {
if ( !isQuitting ) { if ( !isQuitting ) {

Loading…
Cancel
Save