Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

Merge branch 'master' of github.com:firebug/firebug

  • Loading branch information...
commit 2ba178ed4b354a7842acdd8e3ac5d44781bf81f7 2 parents 4d6adfb + 277a226
@janodvarko janodvarko authored
View
16 extension/content/firebug/console/consolePanel.js
@@ -474,6 +474,20 @@ Firebug.ConsolePanel.prototype = Obj.extend(Firebug.ActivablePanel,
row.appendChild(node);
}
+ function logTextNode(text, row)
+ {
+ var nodeSpan = row.ownerDocument.createElement("span");
+ if (text === "" || text === null || typeof(text) == "undefined")
+ Css.setClass(nodeSpan, "logRowHint");
+
+ if (text === "")
+ text = Locale.$STR("console.msg.an_empty_string");
+
+ var node = row.ownerDocument.createTextNode(text);
+ row.appendChild(nodeSpan);
+ nodeSpan.appendChild(node);
+ }
+
if (!objects || !objects.length)
{
// Make sure the log-row has proper height (even if empty).
@@ -545,7 +559,7 @@ Firebug.ConsolePanel.prototype = Obj.extend(Firebug.ActivablePanel,
logText(" ", row);
var object = objects[i];
if (typeof(object) == "string")
- FirebugReps.Text.tag.append({object: object}, row);
+ logTextNode(object, row);
else
this.appendObject(object, row);
}
View
2  extension/content/firebug/css/stylePanel.js
@@ -612,7 +612,7 @@ CSSStylePanel.prototype = Obj.extend(CSSStyleSheetPanel.prototype,
getContextMenuItems: function(style, target)
{
- var items = CSSStyleSheetPanel.prototype.getContextMenuItems(style, target);
+ var items = CSSStyleSheetPanel.prototype.getContextMenuItems.apply(this, [style, target]);
var insertIndex = 0;
for (var i = 0; i < items.length; ++i)
View
2  tests/FBTest/content/FBTestFirebug.js
@@ -1195,7 +1195,7 @@ this.typeCommand = function(string, useCommandEditor)
var cmdLine = getCommandLine(useCommandEditor);
var win = panelBar1.browser.contentWindow;
- FBTest.setPref("commandEditor", useCommandEditor);
+ FBTest.setPref("commandEditor", (useCommandEditor == true));
FW.Firebug.chrome.window.focus();
panelBar1.browser.contentWindow.focus();
View
2  tests/content/console/executeSelection.html
@@ -39,7 +39,7 @@
<code style="color: red"> no selection</code>
</li>
<li>Switch back to Command Line</li>
- <li>Select <code style="color: green">var b = a || "selection"; console.log(b);</code></li>
+ <li>Select <code style="color: green">var b = window.a || "selection"; console.log(b);</code></li>
<li>Press <i>Enter</i></li>
<li>The Console panel should display : <br/>
<code style="color: red"> no selection</code>
Please sign in to comment.
Something went wrong with that request. Please try again.