From a6753301a6a28c495050d2005310971ff133112c Mon Sep 17 00:00:00 2001
From: "timeless%mozdev.org"
 <timeless%mozdev.org@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Sun, 21 Dec 2003 04:04:25 +0000
Subject: [PATCH] Bug 228529 JS Warnings in printing/print preview r=neil sr=bz

git-svn-id: svn://10.0.0.236/trunk@150588 18797224-902f-48f8-a5cc-f745e15eee43
---
 mozilla/mailnews/base/resources/content/msgPrintEngine.js   | 1 +
 .../communicator/resources/content/printPreviewBindings.xml | 4 ++--
 mozilla/xpfe/communicator/resources/content/printing.js     | 2 ++
 .../xpfe/global/resources/content/printPreviewProgress.js   | 6 ++----
 4 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/mozilla/mailnews/base/resources/content/msgPrintEngine.js b/mozilla/mailnews/base/resources/content/msgPrintEngine.js
index 592c0d88d7a..403c6dd325f 100644
--- a/mozilla/mailnews/base/resources/content/msgPrintEngine.js
+++ b/mozilla/mailnews/base/resources/content/msgPrintEngine.js
@@ -26,6 +26,7 @@ var printEngineWindow;
 var printEngine;
 var printSettings = null;
 var doingPrintPreview = false;
+var gWebProgress;
 
 const kMsgBundle = "chrome://messenger/locale/messenger.properties";
 
diff --git a/mozilla/xpfe/communicator/resources/content/printPreviewBindings.xml b/mozilla/xpfe/communicator/resources/content/printPreviewBindings.xml
index 0983cf2d650..84c50767ffd 100644
--- a/mozilla/xpfe/communicator/resources/content/printPreviewBindings.xml
+++ b/mozilla/xpfe/communicator/resources/content/printPreviewBindings.xml
@@ -290,7 +290,7 @@
           }
           else 
           {
-            var total = print.printPreviewNumPages;
+            total = print.printPreviewNumPages;
 
             // bounds check potentially user-entered number
             if (aPageNum > 0 && aPageNum <= total) 
@@ -401,7 +401,7 @@
           var webBrowserPrint;  
           var domWin;  
           try {
-            var ifreq = _content.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
+            ifreq = _content.QueryInterface(Components.interfaces.nsIInterfaceRequestor);
             domWin = ifreq.QueryInterface(Components.interfaces.nsIDOMWindow);
           } catch (e) {
             // Pressing cancel is expressed as an NS_ERROR_ABORT return value,
diff --git a/mozilla/xpfe/communicator/resources/content/printing.js b/mozilla/xpfe/communicator/resources/content/printing.js
index 1e3140c2758..d9738e13634 100644
--- a/mozilla/xpfe/communicator/resources/content/printing.js
+++ b/mozilla/xpfe/communicator/resources/content/printing.js
@@ -39,6 +39,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 var gPrintSettings = null;
+var gPrintSettingsAreGlobal;
+var gSavePrintSettings;
 
 function setPrinterDefaultsForSelectedPrinter(aPrintService)
 {
diff --git a/mozilla/xpfe/global/resources/content/printPreviewProgress.js b/mozilla/xpfe/global/resources/content/printPreviewProgress.js
index 525a89c562a..f7b8cd54416 100644
--- a/mozilla/xpfe/global/resources/content/printPreviewProgress.js
+++ b/mozilla/xpfe/global/resources/content/printPreviewProgress.js
@@ -45,12 +45,10 @@ function elipseString(aStr, doFront)
   if (aStr.length > fixedLen) {
     if (doFront) {
       var endStr = aStr.substr(aStr.length-fixedLen, fixedLen);
-      var str = "..." + endStr;
-      return str;
+      return "..." + endStr;
     } else {
       var frontStr = aStr.substr(0, fixedLen);
-      var str = frontStr + "...";
-      return str;
+      return frontStr + "...";
     }
   }
   return aStr;