- venkman only -

fix array.sort fallout form bug 178722
show view names in floating window titles
don't spew to IS view when changing frames from the UI
bump version number

extensions/venkman/resources/content/command-manager.js

@@ -455,7 +455,8 @@ function cmgr_listnames (partialName, flags)
     for (var c in cmds)
         cmdNames.push (cmds[c].name);
 
-    return cmdNames.sort();
+    cmdNames.sort();
+    return cmdNames;
 }
 
 /**

extensions/venkman/resources/content/venkman-commands.js

@@ -551,7 +551,14 @@ function cmdCommands (e)
     display (getMsg(MSN_TIP1_HELP, 
                     console.prefs["sessionView.requireSlash"] ? "/" : ""));
     display (MSG_TIP2_HELP);
+
     var names = console.commandManager.listNames(e.pattern, CMD_CONSOLE);
+    if (!names.length)
+    {
+        display (getMsg(MSN_NO_CMDMATCH, e.pattern), MT_ERROR);
+        return true;
+    }
+
     names = names.join(MSG_COMMASP);
     
     if (e.pattern)
@@ -803,7 +810,8 @@ function cmdFindFrame (e)
 {
     var jsdFrame = console.frames[e.frameIndex];
 
-    displayFrame (jsdFrame, e.frameIndex, true);
+    if ("isInteractive" in e && e.isInteractive)
+        displayFrame (jsdFrame, e.frameIndex, true);
 
     if (jsdFrame.isNative)
         return true;

extensions/venkman/resources/content/venkman-debugger.js

@@ -619,11 +619,14 @@ function si_seal ()
     if (isURLFiltered(this.url))
     {
         var nada = SCRIPT_NODEBUG | SCRIPT_NOPROFILE;
-        if (this.topLevel)
+        if (this.topLevel && this.topLevel.isValid)
             this.topLevel.jsdScript.flags |= nada;
 
         for (var f in this.functions)
-            this.functions[f].jsdScript.flags |= nada;
+        {
+            if (this.functions[f].jsdScript.isValid)
+                this.functions[f].jsdScript.flags |= nada;
+        }
     }
 
     dispatch ("hook-script-instance-sealed", { scriptInstance: this });

extensions/venkman/resources/content/venkman-floater.js

@@ -35,8 +35,10 @@
 
 var dd       = opener.dd;
 var console  = opener.console;
+var getMsg   = opener.getMsg;
 var dispatch = console.dispatch;
 var windowId;
+var containedViews = new Object();
 
 function onLoad()
 {
@@ -55,7 +57,7 @@ function onLoad()
     if ("arguments" in window && 0 in window.arguments &&
         typeof window.arguments[0] == "function")
     {
-        window.arguments[0](window);
+        setTimeout(window.arguments[0], 500, window);
     }
 }
 
@@ -69,3 +71,28 @@ function onUnload()
 {
     console.viewManager.destroyWindow (windowId);
 }
+
+function onViewRemoved(view)
+{
+    delete containedViews[view.viewId];
+    updateTitle();
+}
+
+function onViewAdded(view)
+{
+    containedViews[view.viewId] = view;
+    updateTitle();
+}
+
+function updateTitle()
+{
+    var ary = new Array();
+    
+    for (v in containedViews)
+        ary.push(containedViews[v].caption);
+
+    document.title = getMsg(opener.MSN_FLOATER_TITLE,
+                            ary.join(opener.MSG_COMMASP));
+}
+
+

extensions/venkman/resources/content/venkman-static.js

@@ -33,7 +33,7 @@
  *
  */
 
-const __vnk_version        = "0.9.39";
+const __vnk_version        = "0.9.40";
 const __vnk_requiredLocale = "0.9.x";
 var   __vnk_versionSuffix  = "";
 

extensions/venkman/resources/content/venkman-views.js

@@ -335,6 +335,8 @@ function bv_init ()
 
     this.atomBreak = console.atomService.getAtom("item-breakpoint");
     this.atomFBreak = console.atomService.getAtom("future-breakpoint");
+
+    this.caption = MSG_VIEW_BREAKS;
 }
 
 console.views.breaks.onShow =
@@ -478,6 +480,8 @@ function lv_init ()
         ]
     };
 
+    this.caption = MSG_VIEW_LOCALS;
+
     this.jsdFrame = null;
     this.savedStates = new Object();
     this.stateTags = new Array();
@@ -791,6 +795,8 @@ function scv_init ()
         ]
     };
 
+    this.caption = MSG_VIEW_SCRIPTS;
+
     this.childData.setSortColumn("baseLineNumber");
     this.groupFiles = console.prefs["scriptsView.groupFiles"];
 
@@ -1205,6 +1211,8 @@ function ss_init ()
          ["session-css-light",    "session-css light",       0]
         ];
 
+    this.caption = MSG_VIEW_SESSION;
+
     /* input history (up/down arrow) related vars */
     this.inputHistory = new Array();
     this.lastHistoryReferenced = -1;
@@ -1638,9 +1646,11 @@ function ss_tabcomplete (e)
         var partialCommand = v.substring(startPos, firstSpace).toLowerCase();
         var cmds = console.commandManager.listNames(partialCommand, CMD_CONSOLE);
 
-        if (!cmds)
+        if (cmds.length == 0)
+        {
             /* partial didn't match a thing */
             display (getMsg(MSN_NO_CMDMATCH, partialCommand), MT_ERROR);
+        }
         else if (cmds.length == 1)
         {
             /* partial matched exactly one command */
@@ -1713,6 +1723,9 @@ function skv_init()
          ["profile-script", {type: "checkbox", checkedif: profileIf}],
         ]
     };
+
+    this.caption = MSG_VIEW_STACK;
+
 }
 
 function cmdCopyFrames (e)
@@ -1955,6 +1968,8 @@ function ss_init ()
         ]
     };
 
+    this.caption = MSG_VIEW_SOURCE2;
+
     this.deck  = null;
     this.tabs  = null;
     this.sourceTabList = new Array();
@@ -3106,6 +3121,8 @@ function sv_init()
         ]
     };
     
+    this.caption = MSG_VIEW_SOURCE;
+
     var atomsvc = console.atomService;
 
     this.atomCurrent        = atomsvc.getAtom("current-line");
@@ -3666,6 +3683,9 @@ function wv_init()
           
         ]
     };
+
+    this.caption = MSG_VIEW_WATCHES;
+
 }
 
 console.views.watches.destroy =
@@ -3901,6 +3921,9 @@ function winv_init ()
                                        "cx.jsdValue.jsType == TYPE_OBJECT"}]
         ]
     };
+
+    this.caption = MSG_VIEW_WINDOWS;
+
 }
 
 console.views.windows.hooks = new Object();

extensions/venkman/resources/content/view-manager.js

@@ -611,6 +611,9 @@ function vmgr_move (parsedLocation, viewId, height, width)
                 if ("onHide" in view)
                     view.onHide();
 
+                if ("onViewRemoved" in view.currentContent.ownerWindow)
+                    view.currentContent.ownerWindow.onViewRemoved(view);
+
                 moveContent (view.currentContent, null);
                 delete view.currentContent;
             }
@@ -672,12 +675,16 @@ function vmgr_move (parsedLocation, viewId, height, width)
             
             if ("onHide" in view)
                 view.onHide();
+
+            if ("onViewRemoved" in currentContent.ownerWindow)
+                currentContent.ownerWindow.onViewRemoved(view);
+
             if (currentContent != content)
             {
                 //dd ("returning content to home");
                 moveContent (currentContent, null);
             }
-        }
+        }        
         
         moveContent (content, container, beforeNode);
         view.currentContent = content;
@@ -688,6 +695,9 @@ function vmgr_move (parsedLocation, viewId, height, width)
         
         if ("onShow" in view)
             view.onShow();
+
+        if ("onViewAdded" in window)
+            window.onViewAdded(view);
     };
 
     var view = this.views[viewId];
@@ -697,7 +707,6 @@ function vmgr_move (parsedLocation, viewId, height, width)
         view.previousLocation = this.computeLocation(currentContent);
 
     this.ensureLocation (parsedLocation, onLocationFound);
-    
 }
 
 ViewManager.prototype.groutContainer =

extensions/venkman/resources/locale/en-US/venkman.properties

@@ -160,6 +160,7 @@ msg.status.default   = Welcome to the JavaScript Debugger
 msn.status.loading   = Loading source for ``%1$S''
 msn.status.marking   = Marking source for ``%1$S''
 msn.status.stopped   = Stopped in %1$S, %2$S
+msn.floater.title    = JSD: %1$S
 
 msg.cant.pprint      = Unable to Pretty Print this function.
 
@@ -336,6 +337,17 @@ msg.bpprops.enabled  = Enable breakpoint
 msg.fbpprops.title   = Future Breakpoint Properties
 msg.fbpprops.enabled = Enable future breakpoint
 
+# view captions
+msg.view.breaks  = Breakpoints
+msg.view.stack   = Call Stack
+msg.view.session = Interactive Session
+msg.view.locals  = Local Variables
+msg.view.scripts = Loaded Scripts
+msg.view.windows = Open Windows
+msg.view.source  = Source Code (old)
+msg.view.source2 = Source Code (new)
+msg.view.watches = Watches
+
 ###################### DO NO LOCALIZE THE *.params STRINGS ######################
 
 ## hooks ##