From 14ba7c7fce588ad97ac9dceb319cd6bd5c9fa6f6 Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com"
 <blakeross%telocity.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 3 Nov 2002 14:51:29 +0000
Subject: [PATCH] Restore Ctrl+0 for resetting text size.

git-svn-id: svn://10.0.0.236/trunk@132920 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/browser/base/content/browser.xul         | 1 +
 mozilla/browser/base/content/contentAreaUtils.js | 2 +-
 mozilla/browser/base/locale/browser.dtd          | 1 +
 mozilla/toolkit/content/viewZoomOverlay.js       | 4 +++-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/mozilla/browser/base/content/browser.xul b/mozilla/browser/base/content/browser.xul
index 466bc47cdd1..d2cf0481fcd 100644
--- a/mozilla/browser/base/content/browser.xul
+++ b/mozilla/browser/base/content/browser.xul
@@ -236,6 +236,7 @@
     <key id="key_textZoomReduce"  key="&textZoomReduceCmd.commandkey;"   command="cmd_textZoomReduce"  modifiers="accel"/>
     <key id="key_textZoomEnlarge" key="&textZoomEnlargeCmd.commandkey;"  command="cmd_textZoomEnlarge" modifiers="accel"/>
     <key                          key="&textZoomEnlargeCmd.commandkey2;" command="cmd_textZoomEnlarge" modifiers="accel"/>
+    <key                          key="&textZoomResetCmd.commandkey;"    oncommand="ZoomManager.prototype.getInstance().reset();"   modifiers="accel"/>
     <key id="key_openDownloadsSidebar" key="&openDownloadsSidebar.commandkey;" command="viewDownloadsSidebar" modifiers="accel"/>
   </keyset>
   
diff --git a/mozilla/browser/base/content/contentAreaUtils.js b/mozilla/browser/base/content/contentAreaUtils.js
index 75db32f7570..d9f33531f2a 100644
--- a/mozilla/browser/base/content/contentAreaUtils.js
+++ b/mozilla/browser/base/content/contentAreaUtils.js
@@ -195,7 +195,7 @@ function foundHeaderInfo(aSniffer, aData)
       return;
   
     var directory = fp.file.parent.QueryInterface(nsILocalFile);
-    prefs.setComplexValue("dir", nsILocalFile, directory);
+    // prefs.setComplexValue("dir", nsILocalFile, directory);
     fp.file.leafName = validateFileName(fp.file.leafName);
     filterIndex = fp.filterIndex;
     file = fp.file;
diff --git a/mozilla/browser/base/locale/browser.dtd b/mozilla/browser/base/locale/browser.dtd
index 94cf213c178..1c82df0a219 100644
--- a/mozilla/browser/base/locale/browser.dtd
+++ b/mozilla/browser/base/locale/browser.dtd
@@ -242,6 +242,7 @@
 <!ENTITY textZoomReduceCmd.label        "Decrease Text Size">
 <!ENTITY textZoomReduceCmd.accesskey    "D">
 <!ENTITY textZoomReduceCmd.commandkey   "-">
+<!ENTITY textZoomResetCmd.commandkey    "0">
 
 <!ENTITY downloadsButton.label          "Downloads">
 <!ENTITY downloadsButton.tooltip        "Displays the progress of ongoing downloads">
diff --git a/mozilla/toolkit/content/viewZoomOverlay.js b/mozilla/toolkit/content/viewZoomOverlay.js
index 0b0ec75ab95..70162d3e536 100644
--- a/mozilla/toolkit/content/viewZoomOverlay.js
+++ b/mozilla/toolkit/content/viewZoomOverlay.js
@@ -91,7 +91,9 @@ ZoomManager.prototype = {
   reduce : function() {
     this.jump(-1);
   },
-
+  reset : function() {
+    this.textZoom = 100;
+  },
   indexOf : function(aZoom) {
     var index = -1;
     if (this.isZoomInRange(aZoom)) {