From 98d168e9a66ba4aadab1be76403b76f4ab72b61e Mon Sep 17 00:00:00 2001
From: "blakeross%telocity.com" <blakeross%telocity.com>
Date: Wed, 27 Feb 2002 00:42:51 +0000
Subject: [PATCH] 125181 - add pref to filter chrome:// errors in javascript
 console. r=ben sr=hewitt a=asa

---
 modules/libpref/src/init/all.js               |  1 +
 .../resources/content/consoleBindings.xml     | 22 +++++++++++++++++++
 .../resources/content/pref-debug.xul          |  6 +++--
 .../resources/locale/en-US/pref-debug.dtd     |  1 +
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/modules/libpref/src/init/all.js b/modules/libpref/src/init/all.js
index 10d61ff40982..664d4b7938ec 100644
--- a/modules/libpref/src/init/all.js
+++ b/modules/libpref/src/init/all.js
@@ -343,6 +343,7 @@ pref("dom.disable_open_during_load", false);
 pref("javascript.enabled",                  true);
 pref("javascript.allow.mailnews",           false);
 pref("javascript.options.strict",           false);
+pref("javascript.options.showInConsole",    true);
 
 // advanced prefs
 pref("advanced.always_load_images",         true);
diff --git a/xpfe/components/console/resources/content/consoleBindings.xml b/xpfe/components/console/resources/content/consoleBindings.xml
index 29225e6ac75c..81c66bdb6195 100644
--- a/xpfe/components/console/resources/content/consoleBindings.xml
+++ b/xpfe/components/console/resources/content/consoleBindings.xml
@@ -18,6 +18,23 @@
       <field name="limit" readonly="true">
         250
       </field>
+      <field name="_showChromeErrors">-1</field>
+      
+      <property name="showChromeErrors">
+        <getter><![CDATA[
+          if (this._showChromeErrors != -1)
+            return this._showChromeErrors;
+          var pref = Components.classes['@mozilla.org/preferences-service;1'].getService();
+          pref = pref.QueryInterface(Components.interfaces.nsIPrefBranch);
+
+          try {
+            return this._showChromeErrors = pref.getBoolPref("javascript.options.showInConsole");
+          }
+          catch(ex) {
+            return this._showChromeErrors = false;
+          }
+        ]]></getter>
+      </property>          
 
       <property name="count" readonly="true">
         <getter>return this.mCount</getter>
@@ -115,6 +132,11 @@
           try {
             // Try to QI it to a script error to get more info
             var scriptError = aObject.QueryInterface(Components.interfaces.nsIScriptError);
+            
+            // filter chrome urls
+            if (!this.showChromeErrors && scriptError.sourceName.substr(0, 9) == "chrome://")
+              return;
+ 
             this.appendError(scriptError);
           } catch (ex) {
             try {
diff --git a/xpfe/components/prefwindow/resources/content/pref-debug.xul b/xpfe/components/prefwindow/resources/content/pref-debug.xul
index cfc9c39cae49..5c2bba310a99 100644
--- a/xpfe/components/prefwindow/resources/content/pref-debug.xul
+++ b/xpfe/components/prefwindow/resources/content/pref-debug.xul
@@ -32,8 +32,8 @@
   <![CDATA[
     var _elementIDs = ["nglayoutDebugWindow", "nglayoutUseNativePrintDialog", "printUseGlobalPrintSettings",
                        "debugXULBoxes", "browserDOMWindowDumpEnabled", 
-                       "javascriptOptionsStrict", "nglayoutDebugUseXBLForms", 
-                       "nglayoutDebugEnableXPCOMRefcntLog", 
+                       "javascriptOptionsStrict", "javascriptOptionsShowInConsole", 
+                       "nglayoutDebugUseXBLForms", "nglayoutDebugEnableXPCOMRefcntLog", 
                        "acceleratorKeyValue", "menuAccessKeyValue"];
   ]]>
   </script>
@@ -71,6 +71,8 @@
               prefstring="browser.dom.window.dump.enabled"/>
     <checkbox id="javascriptOptionsStrict" label="&debugStrictJavascript.label;"
               prefstring="javascript.options.strict"/>
+    <checkbox id="javascriptOptionsShowInConsole" label="&debugConsoleJavascript.label;"
+              prefstring="javascript.options.showInConsole"/>
     <checkbox id="nglayoutDebugUseXBLForms" label="&debugUseXBLForms.label;"
               prefstring="nglayout.debug.enable_xbl_forms"/>
     <checkbox id="nglayoutDebugEnableXPCOMRefcntLog" label="&debugEnableXPCOMRefcntLog.label;"
diff --git a/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd b/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
index 553a1ce8cf72..8d86860fc5c6 100644
--- a/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
+++ b/xpfe/components/prefwindow/resources/locale/en-US/pref-debug.dtd
@@ -9,6 +9,7 @@
 <!ENTITY debugMiscellaneous.label        "Miscellaneous">
 <!ENTITY debugEnableDump.label           "Enable JavaScript dump() output">
 <!ENTITY debugStrictJavascript.label     "Show strict JavaScript warnings">
+<!ENTITY debugConsoleJavascript.label    "Show Javascript errors and warnings in Mozilla chrome in the js console">
 <!ENTITY debugUseXBLForms.label          "Use XBL-based form controls (takes effect after restart). These are still under construction.">
 <!ENTITY debugEnableXPCOMRefcntLog.label "Enable XPCOM Refcount Log">