From 560f84a4bc65b7abd003951f191514761ba35e90 Mon Sep 17 00:00:00 2001
From: hogelog
Date: Tue, 11 Jan 2011 10:00:19 +0900
Subject: disable zoom in/out when load iframe.

https://github.com/philc/vimium/issuesearch?state=open&q=zoom#issue/271
---
 vimiumFrontend.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'vimiumFrontend.js')

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index eb3de996..680578c9 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -61,7 +61,8 @@ function initializePreDomReady() {
   checkIfEnabledForUrl();
 
   var getZoomLevelPort = chrome.extension.connect({ name: "getZoomLevel" });
-  getZoomLevelPort.postMessage({ domain: window.location.host });
+  if (window.self == window.parent)
+    getZoomLevelPort.postMessage({ domain: window.location.host });
 
   chrome.extension.sendRequest({handler: "getLinkHintCss"}, function (response) {
     linkHintCss = response.linkHintCss;
-- 
cgit v1.2.3


From 7d5f9b138f77db9a62f2d2847fd182372afdd9b3 Mon Sep 17 00:00:00 2001
From: ilya
Date: Wed, 9 Feb 2011 01:23:52 -0800
Subject: fix a bug with zoomReset

---
 vimiumFrontend.js | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

(limited to 'vimiumFrontend.js')

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index a5356f3f..6ddc15c3 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -221,18 +221,23 @@ function setPageZoomLevel(zoomLevel, showUINotification) {
 }
 
 function zoomIn() {
-  setPageZoomLevel(currentZoomLevel += 20, true);
-  saveZoomLevel(window.location.host, currentZoomLevel);
+  currentZoomLevel += 20;
+  setAndSaveZoom();
 }
 
 function zoomOut() {
-  setPageZoomLevel(currentZoomLevel -= 20, true);
-  saveZoomLevel(window.location.host, currentZoomLevel);
+  currentZoomLevel -= 20;
+  setAndSaveZoom();
 }
 
 function zoomReset() {
-  setPageZoomLevel(100, true);
-  saveZoomLevel(window.location.host, 100);
+  currentZoomLevel = 100;
+  setAndSaveZoom();
+}
+
+function setAndSaveZoom() {
+  setPageZoomLevel(currentZoomLevel, true);
+  saveZoomLevel(window.location.host, currentZoomLevel);
 }
 
 function scrollToBottom() { window.scrollTo(window.pageXOffset, document.body.scrollHeight); }
-- 
cgit v1.2.3


From 1edb16a47eb8a35fc3ea7991bfdfc8434d1d3bff Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Wed, 9 Feb 2011 23:05:40 -0800
Subject: Style

---
 vimiumFrontend.js | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'vimiumFrontend.js')

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index 6ddc15c3..b7f9308f 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -153,8 +153,8 @@ function initializeWhenEnabled() {
 /*
  * The backend needs to know which frame has focus.
  */
-window.addEventListener("focus", function(e){
-  chrome.extension.sendRequest({handler: "frameFocused", frameId: frameId});
+window.addEventListener("focus", function(e) {
+  chrome.extension.sendRequest({ handler: "frameFocused", frameId: frameId });
 });
 
 /*
@@ -185,7 +185,8 @@ function initializeOnDomReady() {
 // This is a little hacky but sometimes the size wasn't available on domReady?
 function registerFrameIfSizeAvailable (top) {
   if (innerWidth != undefined && innerWidth != 0 && innerHeight != undefined && innerHeight != 0)
-    chrome.extension.sendRequest({ handler: "registerFrame", frameId: frameId, area: innerWidth * innerHeight, top: top, total: frames.length + 1 });
+    chrome.extension.sendRequest({ handler: "registerFrame", frameId: frameId,
+        area: innerWidth * innerHeight, top: top, total: frames.length + 1 });
   else
     setTimeout(function () { registerFrameIfSizeAvailable(top); }, 100);
 }
-- 
cgit v1.2.3


From e6424ce09d27f74608caf69472630537260692ed Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Wed, 9 Feb 2011 23:11:18 -0800
Subject: Re-center the help dialog when it gets taller after clicking "show
 advanced commands"

---
 vimiumFrontend.js | 6 ------
 1 file changed, 6 deletions(-)

(limited to 'vimiumFrontend.js')

diff --git a/vimiumFrontend.js b/vimiumFrontend.js
index b7f9308f..b14e02cc 100644
--- a/vimiumFrontend.js
+++ b/vimiumFrontend.js
@@ -653,12 +653,6 @@ function showHelpDialog(html, fid) {
   container.getElementsByClassName("closeButton")[0].addEventListener("click", hideHelpDialog, false);
   container.getElementsByClassName("optionsPage")[0].addEventListener("click",
       function() { chrome.extension.sendRequest({ handler: "openOptionsPageInNewTab" }); }, false);
-
-  var dialog = document.getElementById("vimiumHelpDialog");
-  dialog.style.zIndex = "99999998";
-  var zoomFactor = currentZoomLevel / 100.0;
-  dialog.style.top =
-      Math.max((window.innerHeight - dialog.clientHeight * zoomFactor) / 2.0, 20) / zoomFactor + "px";
 }
 
 function hideHelpDialog(clickEvent) {
-- 
cgit v1.2.3