From f24f6e50d7dcabe06d730b19fe5710905e413d33 Mon Sep 17 00:00:00 2001
From: Phil Crosby
Date: Mon, 18 Jan 2010 00:32:02 -0800
Subject: Have the Options page use the default settings hash defined in
 background_page.html

---
 background_page.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'background_page.html')

diff --git a/background_page.html b/background_page.html
index 5399c51f..72ee32cb 100644
--- a/background_page.html
+++ b/background_page.html
@@ -98,7 +98,8 @@
     var returnPort = chrome.tabs.connect(port.tab.id, { name: "returnZoomLevel" });
     var localStorageKey = "zoom" + args.domain;
     var zoomLevelForDomain = (localStorage[localStorageKey] || "").split(",")[1];
-    var zoomLevel = parseInt(zoomLevelForDomain || localStorage["defaultZoomLevel"] || 100);
+    var zoomLevel = parseInt(zoomLevelForDomain || localStorage["defaultZoomLevel"] ||
+        settings.defaultZoomLevel);
     returnPort.postMessage({ zoomLevel: zoomLevel });
   }
 
-- 
cgit v1.2.3