[Pkg-mozext-commits] [firebug] 70/82: Issue 6220: Don't show trace* in the command line help

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to tag fbtest-1.11.2
in repository firebug.

commit 7a787799e1c48846bbb2cc330cc65b242d993e84
Author: Jan Odvarko <odvarko at gmail.com>
Date:   Wed Jan 30 08:17:01 2013 +0100

     Issue 6220: Don't show trace* in the command line help
---
 extension/content/firebug/console/commandLine.js     | 16 ++++++++++++----
 extension/content/firebug/console/commandLineHelp.js | 11 +++++++++--
 extension/locale/en-US/firebug.properties            |  6 ++++++
 3 files changed, 27 insertions(+), 6 deletions(-)

diff --git a/extension/content/firebug/console/commandLine.js b/extension/content/firebug/console/commandLine.js
index 0528761..6df9c06 100644
--- a/extension/content/firebug/console/commandLine.js
+++ b/extension/content/firebug/console/commandLine.js
@@ -1169,25 +1169,33 @@ function FirebugCommandLineAPI(context)
 
     this.traceAll = function()
     {
-        Firebug.Debugger.traceAll(Firebug.currentContext);
+        // See issue 6220
+        Firebug.Console.log(Locale.$STR("commandline.MethodDisabled"));
+        //Firebug.Debugger.traceAll(Firebug.currentContext);
         return Firebug.Console.getDefaultReturnValue(context.window);
     };
 
     this.untraceAll = function()
     {
-        Firebug.Debugger.untraceAll(Firebug.currentContext);
+        // See issue 6220
+        Firebug.Console.log(Locale.$STR("commandline.MethodDisabled"));
+        //Firebug.Debugger.untraceAll(Firebug.currentContext);
         return Firebug.Console.getDefaultReturnValue(context.window);
     };
 
     this.traceCalls = function(fn)
     {
-        Firebug.Debugger.traceCalls(Firebug.currentContext, fn);
+        // See issue 6220
+        Firebug.Console.log(Locale.$STR("commandline.MethodDisabled"));
+        //Firebug.Debugger.traceCalls(Firebug.currentContext, fn);
         return Firebug.Console.getDefaultReturnValue(context.window);
     };
 
     this.untraceCalls = function(fn)
     {
-        Firebug.Debugger.untraceCalls(Firebug.currentContext, fn);
+        // See issue 6220
+        Firebug.Console.log(Locale.$STR("commandline.MethodDisabled"));
+        //Firebug.Debugger.untraceCalls(Firebug.currentContext, fn);
         return Firebug.Console.getDefaultReturnValue(context.window);
     };
 
diff --git a/extension/content/firebug/console/commandLineHelp.js b/extension/content/firebug/console/commandLineHelp.js
index b0e385e..eb12ce5 100644
--- a/extension/content/firebug/console/commandLineHelp.js
+++ b/extension/content/firebug/console/commandLineHelp.js
@@ -144,11 +144,18 @@ var CommandLineHelp = domplate(
 
         var commands = [];
 
+        var ignore = ["traceCalls", "untraceCalls", "traceAll", "untraceAll"];
         for (var i=0; i<CommandLineExposed.commands.length; i++)
         {
+            var cmd = CommandLineExposed.commands[i];
+
+            // See Issue 5221
+            if (ignore.indexOf(cmd) >= 0)
+                continue;
+
             commands.push({
-                name: CommandLineExposed.commands[i],
-                desc: "console.cmd.help." + CommandLineExposed.commands[i],
+                name: cmd,
+                desc: "console.cmd.help." + cmd,
                 type: CMD_TYPE_COMMAND,
             })
         }
diff --git a/extension/locale/en-US/firebug.properties b/extension/locale/en-US/firebug.properties
index e06482c..d5a2419 100644
--- a/extension/locale/en-US/firebug.properties
+++ b/extension/locale/en-US/firebug.properties
@@ -746,11 +746,17 @@ panel.tip.Enabled=Toggle the panel activation
 # Firebug toolbar. This button allows to open the Command Line within other panels
 # than the Console panel.
 panel.tooltip.Show_Command_Line_Popup=Show Command Line Popup
+
 # LOCALIZATION NOTE (console.MethodNotSupported): Message displayed in the Console panel,
 # if a specific method is not supported.
 # %S = Name of the unsupported method
 # example: Firebug console does not support 'bind'
 console.MethodNotSupported=Firebug console does not support '%S'
+
+# LOCALIZATION NOTE (commandline.MethodDisabled): Message displayed in the Console panel,
+# if a disabled method is entered via the Command Line.
+commandline.MethodDisabled=This command line method is temporarily disabled
+
 # LOCALIZATION NOTE (commandline.MethodNotSupported): Message displayed in the Console panel,
 # if an unsupported method is entered via the Command Line.
 # %S = Name of the unsupported method

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/firebug.git