Zoom: fixes and improvements

fixes #2397

app.js

@@ -147,3 +147,23 @@ ipc.on('toggleStatusBar', function() {
 window.addEventListener('focus', function() {
 	if(Ext.cq1("app-main")) Ext.cq1("app-main").getActiveTab().down('component').el.dom.focus();
 });
+
+// Handles zoom from menu
+ipc.on('resetzoom-webview', function() {
+	var tabPanel = Ext.cq1('app-main');
+	if ( tabPanel.items.indexOf(tabPanel.getActiveTab()) === 0 ) return false;
+
+	tabPanel.getActiveTab().resetZoom();
+});
+ipc.on('zoomin-webview', function() {
+	var tabPanel = Ext.cq1('app-main');
+	if ( tabPanel.items.indexOf(tabPanel.getActiveTab()) === 0 ) return false;
+
+	tabPanel.getActiveTab().zoomIn();
+});
+ipc.on('zoomout-webview', function() {
+	var tabPanel = Ext.cq1('app-main');
+	if ( tabPanel.items.indexOf(tabPanel.getActiveTab()) === 0 ) return false;
+
+	tabPanel.getActiveTab().zoomOut();
+});

app/ux/WebView.js

@@ -807,25 +807,29 @@ Ext.define('Rambox.ux.WebView',{
 	}
 
 	,zoomIn: function() {
-		var me = this;
-		var webview = me.getWebView();
-
-		me.zoomLevel = me.zoomLevel + 0.25;
-		if ( me.record.get('enabled') ) {
-			webview.setZoomLevel(me.zoomLevel);
-			me.record.set('zoomLevel', me.zoomLevel);
-		}
+		if ( this.timeout ) clearTimeout( this.timeout );
+			this.timeout = setTimeout(() => {
+				var me = this;
+				var webview = me.getWebView();
+				me.zoomLevel = me.zoomLevel + 0.25;
+				if ( me.record.get('enabled') ) {
+					webview.setZoomLevel(me.zoomLevel);
+					me.record.set('zoomLevel', me.zoomLevel);
+				}
+		}, 100);
 	}
 
 	,zoomOut: function() {
-		var me = this;
-		var webview = me.getWebView();
-
-		me.zoomLevel = me.zoomLevel - 0.25;
-		if ( me.record.get('enabled') ) {
-			webview.setZoomLevel(me.zoomLevel);
-			me.record.set('zoomLevel', me.zoomLevel);
-		}
+		if ( this.timeout ) clearTimeout( this.timeout );
+			this.timeout = setTimeout(() => {
+				var me = this;
+				var webview = me.getWebView();
+				me.zoomLevel = me.zoomLevel - 0.25;
+				if ( me.record.get('enabled') ) {
+					webview.setZoomLevel(me.zoomLevel);
+					me.record.set('zoomLevel', me.zoomLevel);
+				}
+		}, 100);
 	}
 
 	,resetZoom: function() {

electron/menu.js

@@ -172,13 +172,16 @@ module.exports = function(config) {
 					type: 'separator'
 				},
 				{
-					role: 'zoomin'
+					label: 'Zoom In',
+					click(item, win) { win.webContents.send('zoomin-webview')}
 				},
 				{
-					role: 'zoomout'
+					label: 'Zoom Out',
+					click(item, win) { win.webContents.send('zoomout-webview')}
 				},
 				{
-					role: 'resetzoom'
+					label: 'Reset Zoom',
+					click(item, win) { win.webContents.send('resetzoom-webview')}
 				}
 			]
 		},