From ca0ebf3fe67db3d7f4af7b40cff6dbbe38f9975d Mon Sep 17 00:00:00 2001
From: "rginda%netscape.com"
 <rginda%netscape.com@18797224-902f-48f8-a5cc-f745e15eee43>
Date: Wed, 20 Feb 2002 06:45:47 +0000
Subject: [PATCH] - venkman only - add fbreak command to source view context
 menu

git-svn-id: svn://10.0.0.236/trunk@115072 18797224-902f-48f8-a5cc-f745e15eee43
---
 .../extensions/venkman/resources/content/venkman-commands.js | 5 +++--
 .../extensions/venkman/resources/content/venkman-debugger.js | 2 --
 .../extensions/venkman/resources/content/venkman-handlers.js | 2 +-
 .../extensions/venkman/resources/content/venkman-menus.js    | 3 ++-
 .../venkman/resources/locale/en-US/venkman.properties        | 5 +++--
 5 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/mozilla/extensions/venkman/resources/content/venkman-commands.js b/mozilla/extensions/venkman/resources/content/venkman-commands.js
index 3e889968793..4c2f021872a 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-commands.js
+++ b/mozilla/extensions/venkman/resources/content/venkman-commands.js
@@ -488,7 +488,7 @@ function cmdEvald (e)
 
 function cmdFBreak(e)
 {
-    if (!e.filePattern)
+    if (!e.fileName)
     {  /* if no input data, just list the breakpoints */
         var bplist = console.breakpoints.childData;
 
@@ -508,7 +508,8 @@ function cmdFBreak(e)
         return true;
     }
 
-    setFutureBreakpoint (e.filePattern, e.lineNumber);
+    if (setFutureBreakpoint (e.fileName, e.lineNumber))
+        feedback (e, getMsg(MSN_FBP_CREATED, [e.fileName, e.lineNumber]));
     return true;
 }
 
diff --git a/mozilla/extensions/venkman/resources/content/venkman-debugger.js b/mozilla/extensions/venkman/resources/content/venkman-debugger.js
index 8dc001fab50..44204902471 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-debugger.js
+++ b/mozilla/extensions/venkman/resources/content/venkman-debugger.js
@@ -927,7 +927,5 @@ function setFutureBreakpoint (filePattern, line)
     }
     
     console.breakpoints.appendChild (bpr);
-    feedback (getMsg(MSN_FBP_CREATED, [filePattern, line]));
-    
     return bpr;
 }
diff --git a/mozilla/extensions/venkman/resources/content/venkman-handlers.js b/mozilla/extensions/venkman/resources/content/venkman-handlers.js
index dc13fc705c3..95861122461 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-handlers.js
+++ b/mozilla/extensions/venkman/resources/content/venkman-handlers.js
@@ -37,7 +37,7 @@ function initHandlers()
 {
     function wwObserve (subject, topic, data)
     {
-        dd ("wwObserver::Observe " + subject + ", " + topic);
+        //dd ("wwObserver::Observe " + subject + ", " + topic);
         if (topic == "domwindowopened")
             console.onWindowOpen (subject);
         else
diff --git a/mozilla/extensions/venkman/resources/content/venkman-menus.js b/mozilla/extensions/venkman/resources/content/venkman-menus.js
index a07996af213..a8b1579cf50 100644
--- a/mozilla/extensions/venkman/resources/content/venkman-menus.js
+++ b/mozilla/extensions/venkman/resources/content/venkman-menus.js
@@ -135,7 +135,8 @@ function initMenus()
 
     /* Context menu for source view */
     C("source-outliner", "source");
-     m("break", {enabledif: "cx.lineIsExecutable && !has('breakpointRec')"});
+     m("break",  {enabledif: "cx.lineIsExecutable && !has('breakpointRec')"});
+     m("fbreak", {enabledif: "!cx.lineIsExecutable && !has('breakpointRec')"});
      m("clear");
      m("-");
      m("cont");
diff --git a/mozilla/extensions/venkman/resources/locale/en-US/venkman.properties b/mozilla/extensions/venkman/resources/locale/en-US/venkman.properties
index 1ba8b9c18c3..7a678adaa13 100644
--- a/mozilla/extensions/venkman/resources/locale/en-US/venkman.properties
+++ b/mozilla/extensions/venkman/resources/locale/en-US/venkman.properties
@@ -297,8 +297,9 @@ cmd.em-cycle.key    = accel shift  E
 cmd.em-ignore.label = Ig&nore Errors
 cmd.em-trace.label  = Tr&ace Errors
 
-cmd.fbreak.params = [<file-pattern> <line-number>]
-cmd.fbreak.help   = Sets a ``future'' breakpoint.  Any time a script whose file name matches <file-pattern> is loaded, a breakpoint a <line-number> is set.  Setting a breakpoint at line 1 will cause the debugger to break when the script is loaded.  fbreak with no parameters will list all future breakponts.  See also: break
+cmd.fbreak.label  = Set &Future Breakpoint
+cmd.fbreak.params = [<file-name> <line-number>]
+cmd.fbreak.help   = Sets a ``future'' breakpoint.  Any time a script whose file name matches <file-name> is loaded, a breakpoint a <line-number> is set.  Setting a breakpoint at line 1 will cause the debugger to break when the script is loaded.  fbreak with no parameters will list all future breakponts.  See also: break
 
 cmd.find-bp.label  = Find &Breakpoint
 cmd.find-bp.params = <breakpoint-rec>