Merge remote-tracking branch 'upstream/master' into issue5639

extension/bootstrap.js

@@ -73,6 +73,7 @@ function startup(params, reason)
 
     // GCLI commands
     Cu.import("resource://firebug/gcli.js");
+    FirebugGCLICommands.startup();
 }
 
 function shutdown(params, reason)
@@ -94,6 +95,9 @@ function shutdown(params, reason)
         Cu.reportError(e);
     }
 
+    // Unregister all GCLI commands
+    FirebugGCLICommands.shutdown();
+
     // xxxHonza: I think this shouldn't be here (perhaps in firebug-service.js)
     // Shutdown Firebug's JSD debugger service.
     var fbs = Cu.import("resource://firebug/firebug-service.js", {}).fbs;

extension/content/firebug/branch.properties

@@ -1,5 +1,5 @@
 # DO NOT MERGE INTO TRUNK
-RELEASE=.0a0
+RELEASE=.0a2
 VERSION=1.11
 TRUNK=
 # To allow build.xml to drop the xpi directly into the svn working copy for getfirebug.com

extension/content/firebug/chrome/activation.js

@@ -85,9 +85,12 @@ Firebug.Activation = Obj.extend(Firebug.Module,
             var hasAnnotation = Annotations.pageHasAnnotation(uri);
 
             if (FBTrace.DBG_ACTIVATION)
-                FBTrace.sysout("shouldCreateContext hasAnnotation "+hasAnnotation +
-                    " for "+uri.spec+" in "+browser.contentWindow.location +
-                    " using activateSameOrigin: "+Firebug.activateSameOrigin);
+            {
+                FBTrace.sysout("shouldCreateContext hasAnnotation " + hasAnnotation +
+                    " for " + uri.spec + " in " +
+                    (browser ? browser.contentWindow.location : "no browser") +
+                    " using activateSameOrigin: " + Firebug.activateSameOrigin);
+            }
 
             // Annotated, so return the value.
             if (hasAnnotation)
@@ -97,9 +100,12 @@ Firebug.Activation = Obj.extend(Firebug.Module,
             {
                 var dst = browser.FirebugLink.dst;
                 var dstURI = this.convertToURIKey(dst.spec, Firebug.activateSameOrigin);
+
                 if (FBTrace.DBG_ACTIVATION)
+                {
                     FBTrace.sysout("shouldCreateContext found FirebugLink pointing to " +
                         dstURI.spec, browser.FirebugLink);
+                }
 
                 if (dstURI && dstURI.equals(uri)) // and it matches us now
                 {
@@ -109,8 +115,10 @@ Firebug.Activation = Obj.extend(Firebug.Module,
                     if (srcURI)
                     {
                         if (FBTrace.DBG_ACTIVATION)
+                        {
                             FBTrace.sysout("shouldCreateContext found FirebugLink pointing from " +
                                 srcURI.spec, browser.FirebugLink);
+                        }
 
                         // and it's on the same domain
                         if (srcURI.schemeIs("file") || (dstURI.host == srcURI.host))

extension/content/firebug/chrome/chrome.js

@@ -1376,7 +1376,7 @@ var FirebugChrome =
 
             var sidePanel = panelBar2.selectedPanel;
             if (sidePanel)
-                sidePanel.select(object);
+                sidePanel.refresh();
         }
     },
 
@@ -1511,9 +1511,11 @@ var FirebugChrome =
         var realObject = rep ? rep.getRealObject(object, Firebug.currentContext) : null;
         var realRep = realObject ? Firebug.getRep(realObject, Firebug.currentContext) : null;
 
-        if (FBTrace.DBG_OPTIONS)
-            FBTrace.sysout("chrome.onContextShowing object:"+object+" rep: "+rep+
-                " realObject: "+realObject+" realRep:"+realRep);
+        if (FBTrace.DBG_MENU)
+        {
+            FBTrace.sysout("chrome.onContextShowing object:"+object+", rep: "+rep+
+                ", realObject: "+realObject+", realRep:"+realRep);
+        }
 
         if (realObject && realRep)
         {

extension/content/firebug/chrome/menu.js

@@ -4,9 +4,10 @@ define([
     "firebug/lib/trace",
     "firebug/lib/locale",
     "firebug/lib/options",
-    "firebug/lib/css"
+    "firebug/lib/css",
+    "firebug/lib/deprecated"
 ],
-function(FBTrace, Locale, Options, Css) {
+function(FBTrace, Locale, Options, Css, Deprecated) {
 
 // ********************************************************************************************* //
 // Constants
@@ -30,7 +31,7 @@ Menu.createMenu = function(popup, label)
 
 Menu.createMenuItem = function(popup, item, before)
 {
-    if (typeof(item) == "string" && item.charAt(0) == "-")
+    if ((typeof(item) == "string" && item == "-") || item.label == "-")
         return Menu.createMenuSeparator(popup, before);
 
     var menuitem = popup.ownerDocument.createElement("menuitem");
@@ -116,17 +117,30 @@ Menu.createMenuHeader = function(popup, item)
     return header;
 };
 
-Menu.createMenuSeparator = function(popup, before)
+Menu.createMenuSeparator = function(popup, item, before)
 {
+    if (item instanceof Node)
+    {
+        return Deprecated.deprecated("The function's header changed to "+
+            "createMenuSeparator(popup, item, before)",
+            Menu.createMenuSeparator, [popup, null, before])();
+    }
+
     if (!popup.firstChild)
         return;
 
-    var menuitem = popup.ownerDocument.createElement("menuseparator");
+    if (FBTrace.DBG_MENU)
+        FBTrace.sysout("createMenuSeparator", {popup: popup, item: item, before: before});
+
+    var menuItem = popup.ownerDocument.createElement("menuseparator");
+    if (item && item.id)
+        menuItem.setAttribute("id", item.id);
+
     if (before)
-        popup.insertBefore(menuitem, before);
+        popup.insertBefore(menuItem, before);
     else
-        popup.appendChild(menuitem);
-    return menuitem;
+        popup.appendChild(menuItem);
+    return menuItem;
 };
 
 /**

extension/content/firebug/chrome/reps.js

@@ -285,6 +285,7 @@ FirebugReps.Func = domplate(Firebug.Rep,
         var monitored = scriptInfo ? FBS.fbs.isMonitored(scriptInfo.sourceFile.href,
             scriptInfo.lineNo) : false;
 
+        var self = this;
         var name = script ? StackFrame.getFunctionName(script, context) : fn.name;
         return [
             {
@@ -293,7 +294,11 @@ FirebugReps.Func = domplate(Firebug.Rep,
                 nol10n: true,
                 type: "checkbox",
                 checked: monitored,
-                command: Obj.bindFixed(this.monitor, this, fn, monitored)
+                command: function()
+                {
+                    var checked = this.hasAttribute("checked");
+                    self.monitor(fn, !checked);
+                }
             },
             "-",
             {
@@ -671,7 +676,7 @@ FirebugReps.Arr = domplate(Firebug.Rep,
 
     highlightObject: function(object, context, target)
     {
-        // Highlighting huge amount of elements on the page can cause sericous performance
+        // Highlighting huge amount of elements on the page can cause serious performance
         // problems (see issue 4736). So, avoid highlighting if the number of elements in
         // the array exceeds specified limit.
         var arr = this.getRealObject(object, context);
@@ -711,7 +716,7 @@ FirebugReps.Arr = domplate(Firebug.Rep,
             else if (obj instanceof Ci.nsIDOMHistory)
                 return false;
             // do this first to avoid exceptions
-            else if (obj.toString() === "[xpconnect wrapped native prototype]")
+            else if (obj.toString && obj.toString() === "[xpconnect wrapped native prototype]")
                 return false;
             else if (isFinite(obj.length) && typeof obj.splice === "function")
                 return true;
@@ -907,14 +912,12 @@ FirebugReps.Element = domplate(Firebug.Rep,
     {
         try
         {
-            return elt.getAttribute("class")
-                ? ("." + elt.getAttribute("class").split(" ")[0])
-                : "";
+            return elt.classList.length > 0 ? ("." + elt.classList[0]) : "";
         }
         catch (err)
         {
+            return "";
         }
-        return "";
     },
 
     getValue: function(elt)
@@ -1108,8 +1111,11 @@ FirebugReps.Element = domplate(Firebug.Rep,
 
     getContextMenuItems: function(elt, target, context)
     {
+        // XXX: Temporary fix for issue 5577.
+        if (Dom.getAncestorByClass(target, "cssElementRuleContainer"))
+            return;
+
         var type;
-        var monitored = EventMonitor.areEventsMonitored(elt, null, context);
         var items = [];
 
         if (Xml.isElementHTML(elt) || Xml.isElementXHTML(elt))
@@ -1175,9 +1181,12 @@ FirebugReps.Element = domplate(Firebug.Rep,
                 tooltiptext: "html.tip.Show_Events_In_Console",
                 id: "fbShowEventsInConsole",
                 type: "checkbox",
-                checked: monitored,
-                command: Obj.bindFixed(EventMonitor.toggleMonitorEvents,
-                    EventMonitor, elt, null, monitored, context)
+                checked: EventMonitor.areEventsMonitored(elt, null, context),
+                command: function()
+                {
+                    var checked = this.hasAttribute("checked");
+                    EventMonitor.toggleMonitorEvents(elt, null, !checked, context);
+                }
             },
             "-",
             {

extension/content/firebug/chrome/tabContext.js

@@ -215,7 +215,7 @@ Firebug.TabContext.prototype =
         // to iframes (documents), which can be already unloaded at this point.
         // Removing listeners from such 'unloaded' documents (or window) can throw
         // "TypeError: can't access dead object"
-        // We should avoid these exceptions (event if they are not representing mem leaks)
+        // We should avoid these exceptions (even if they are not representing memory leaks)
         this.unregisterAllListeners();
 
         state.panelState = {};

extension/content/firebug/console/commandHistory.js

@@ -78,25 +78,21 @@ Firebug.CommandHistory = function()
         var command;
         var commandLine = Firebug.CommandLine.getCommandLine(context);
 
-        if (dir < 0)
-        {
-            if (commandPointer > 0)
-                commandPointer--;
-        }
-        else
-        {
-            if (commandPointer < commands.length)
-                commandPointer++;
-        }
+        commandPointer += dir;
+        if (commandPointer < 0)
+            commandPointer = 0;
+        else if (commandPointer > commands.length)
+            commandPointer = commands.length;
 
         if (commandPointer < commands.length)
         {
             command = commands[commandPointer];
             if (commandsPopup.state == "open")
             {
-                var commandElements = commandsPopup.ownerDocument.getElementsByClassName(
-                    "commandHistoryItem");
-                this.selectCommand(commandElements[commandPointer]);
+                var commandElement = commandsPopup.children[commandPointer];
+                this.selectCommand(commandElement);
+
+                Dom.scrollMenupopup(commandsPopup, commandElement);
             }
         }
         else
@@ -119,7 +115,7 @@ Firebug.CommandHistory = function()
     this.show = function(element)
     {
         if (this.isShown())
-            return this.hide;
+            return this.hide();
 
         Dom.eraseNode(commandsPopup);
 
@@ -145,17 +141,16 @@ Firebug.CommandHistory = function()
         commandsPopup.openPopup(element, "before_start", 0, 0, false, false);
 
         // make sure last element is visible
-        var box = doc.getAnonymousNodes(commandsPopup)[0];
-        var scrollBox = doc.getAnonymousNodes(box)[1];
-        scrollBox.scrollTop = scrollBox.scrollHeight;
+        setTimeout(Dom.scrollMenupopup, 10, commandsPopup, hbox);
+        this.isOpen = true;
 
         return true;
     };
 
     this.hide = function()
     {
         commandsPopup.hidePopup();
-
+        this.isOpen = false;
         return true;
     };
 
@@ -205,6 +200,7 @@ Firebug.CommandHistory = function()
     {
         Firebug.chrome.setGlobalAttribute("fbCommandLineHistoryButton", "checked", "false");
         Firebug.chrome.setGlobalAttribute("fbCommandEditorHistoryButton", "checked", "false");
+        this.isOpen = false;
     };
 };
 

extension/content/firebug/console/commandLine.js

@@ -878,7 +878,8 @@ Firebug.CommandLine = Obj.extend(Firebug.Module,
                 this.commandHistory.hide();
                 return true;
         }
-
+        if (this.commandHistory.isOpen && !event.metaKey && !event.ctrlKey && !event.altKey)
+            this.commandHistory.hide();
         return false;
     },
 

extension/content/firebug/console/console.js

@@ -13,6 +13,7 @@ define([
     "firebug/chrome/searchBox",
     "firebug/console/consolePanel",
     "firebug/console/commandEditor",
+    "firebug/console/functionMonitor",
 ],
 function(Obj, Firebug, Firefox, Events, Win, Search, Xml, Options) {
 
@@ -404,22 +405,6 @@ Firebug.Console = Obj.extend(ActivableConsole,
         }
     },
 
-    // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
-    // Firebug.Debugger listener
-
-    onMonitorScript: function(context, frame)
-    {
-        Firebug.Console.log(frame, context);
-    },
-
-    onFunctionCall: function(context, frame, depth, calling)
-    {
-        if (calling)
-            Firebug.Console.openGroup([frame, "depth:"+depth], context);
-        else
-            Firebug.Console.closeGroup(context);
-    },
-
     // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
     // BTI
 

extension/content/firebug/console/consolePanel.js

@@ -294,8 +294,11 @@ Firebug.ConsolePanel.prototype = Obj.extend(Firebug.ActivablePanel,
             type: "checkbox",
             checked: strictValue,
             tooltiptext: "console.option.tip.Show_Strict_Warnings",
-            command: Obj.bindFixed(Options.setPref, Options,
-                strictDomain, strictName, !strictValue)
+            command: function()
+            {
+                var checked = this.hasAttribute("checked");
+                Options.setPref(strictDomain, strictName, checked);
+            }
         };
     },
 

extension/content/firebug/console/errors.js

@@ -371,8 +371,12 @@ var Errors = Firebug.Errors = Obj.extend(Firebug.Module,
             correctLineNumbersOnExceptions(object, error);
         }
 
-        if (Firebug.showStackTrace && Firebug.errorStackTrace)
+        if (Firebug.errorStackTrace)
+        {
             error.correctWithStackTrace(Firebug.errorStackTrace);
+            if (!Firebug.showStackTrace)
+                error.trace = null;
+        }
 
         var msgId = lessTalkMoreAction(context, object, isWarning);
         if (!msgId)