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

@@ -26,6 +26,7 @@ var printEngineWindow;
 var printEngine;
 var printSettings = null;
 var doingPrintPreview = false;
+var gWebProgress;
 
 const kMsgBundle = "chrome://messenger/locale/messenger.properties";
 

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,

mozilla/xpfe/communicator/resources/content/printing.js

@@ -39,6 +39,8 @@
  * ***** END LICENSE BLOCK ***** */
 
 var gPrintSettings = null;
+var gPrintSettingsAreGlobal;
+var gSavePrintSettings;
 
 function setPrinterDefaultsForSelectedPrinter(aPrintService)
 {

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;