From 67451bba0f59e9e03f4503940d73fd2cdd0b8d61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fla=CC=81vio=20Rodrigues?= Date: Thu, 20 Oct 2016 09:59:55 -0200 Subject: [PATCH] Codding style fixes --- tabs-tabs-tabs/tabs.html | 6 ++-- tabs-tabs-tabs/tabs.js | 66 +++++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 35 deletions(-) diff --git a/tabs-tabs-tabs/tabs.html b/tabs-tabs-tabs/tabs.html index ad0f564..e286521 100644 --- a/tabs-tabs-tabs/tabs.html +++ b/tabs-tabs-tabs/tabs.html @@ -14,9 +14,9 @@ Remove active tab
Create a tab
Alert active tab info
- Increase tab zoom
- decrease tab zoom
- default tab zoom
+ Zoom in
+ Zoom out
+ Reset zoom
diff --git a/tabs-tabs-tabs/tabs.js b/tabs-tabs-tabs/tabs.js index 3b46795..65a17b6 100644 --- a/tabs-tabs-tabs/tabs.js +++ b/tabs-tabs-tabs/tabs.js @@ -1,3 +1,9 @@ +// Zoom constants. Define Max, Min, increment and default values +const ZOOM_INCREMENT = 0.2; +const MAX_ZOOM = 3; +const MIN_ZOOM = 0.3; +const DEFAULT_ZOOM = 1; + function firstUnpinnedTab(tabs) { for (var tab of tabs) { if (!tab.pinned) { @@ -71,47 +77,43 @@ document.addEventListener("click", function(e) { } else if (e.target.id === "tabs-add-zoom") { - callOnActiveTab((tab) => { - chrome.tabs.getZoom(tab.id, function(zoomFactor){ - var newZoomFactor = zoomFactor + 0.2; - newZoomFactor = newZoomFactor > 3 ? 3 : newZoomFactor - - //the maximum zoomFactor is 3, it can't go higher - if (zoomFactor >= 3) { - alert("Tab zoom factor is already at max!"); - } else { - chrome.tabs.setZoom(tab.id, newZoomFactor); - } - }); + callOnActiveTab((tab) => { + chrome.tabs.getZoom(tab.id, function(zoomFactor){ + //the maximum zoomFactor is 3, it can't go higher + if (zoomFactor >= MAX_ZOOM) { + alert("Tab zoom factor is already at max!"); + } else { + var newZoomFactor = zoomFactor + ZOOM_INCREMENT; + chrome.tabs.setZoom(tab.id, newZoomFactor); + } }); + }); } else if (e.target.id === "tabs-decrease-zoom") { - callOnActiveTab((tab) => { - chrome.tabs.getZoom(tab.id, function(zoomFactor){ - var newZoomFactor = zoomFactor - 0.2; - newZoomFactor = newZoomFactor < 0.3 ? 0.3 : newZoomFactor - - //the minimum zoomFactor is 0.3, it can't go lower - if (zoomFactor <= 0.3) { - alert("Tab zoom factor is already at minimum!"); - } else { - chrome.tabs.setZoom(tab.id, newZoomFactor); - } - }); + callOnActiveTab((tab) => { + chrome.tabs.getZoom(tab.id, function(zoomFactor){ + //the minimum zoomFactor is 0.3, it can't go lower + if (zoomFactor <= MIN_ZOOM) { + alert("Tab zoom factor is already at minimum!"); + } else { + var newZoomFactor = zoomFactor - ZOOM_INCREMENT; + chrome.tabs.setZoom(tab.id, newZoomFactor); + } }); + }); } else if (e.target.id === "tabs-default-zoom") { - callOnActiveTab((tab) => { - chrome.tabs.getZoom(tab.id, function(zoomFactor){ - if (zoomFactor == 1) { - alert("Tab zoom is already at the default zoom factor"); - } else { - chrome.tabs.setZoom(tab.id, 1); - } - }); + callOnActiveTab((tab) => { + chrome.tabs.getZoom(tab.id, function(zoomFactor){ + if (zoomFactor == DEFAULT_ZOOM) { + alert("Tab zoom is already at the default zoom factor"); + } else { + chrome.tabs.setZoom(tab.id, DEFAULT_ZOOM); + } }); + }); } e.preventDefault();