1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 11:27:58 +01:00

merge improvements in :echo object

This commit is contained in:
Doug Kearns
2007-11-13 06:00:32 +00:00
parent 0f9951e048
commit 2985555caa

View File

@@ -45,40 +45,48 @@ vimperator.util = {
{ {
var type = typeof(arg); var type = typeof(arg);
if (type == "number") // some objects like window.JSON or getBrowsers()._browsers need the try/catch
try
{ {
return "<span style=\"color: red;\">" + arg + "</span>"; if (type == "number")
} {
else if (type == "string") return "<span style=\"color: red;\">" + arg + "</span>";
{ }
if (process_strings) else if (type == "string")
arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"'; {
if (process_strings)
arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
return "<span style=\"color: green;\">" + arg + "</span>"; return "<span style=\"color: green;\">" + arg + "</span>";
} }
else if (type == "boolean") else if (type == "boolean")
{ {
return "<span style=\"color: blue;\">" + arg + "</span>"; return "<span style=\"color: blue;\">" + arg + "</span>";
} }
else if (arg == null || arg == "undefined") else if (arg == null || arg == "undefined")
{ {
return "<span style=\"color: blue;\">" + arg + "</span>"; return "<span style=\"color: blue;\">" + arg + "</span>";
} }
else if (type == "object" || type == "function") else if (type == "object" || type == "function")
{ {
// for java packages value.toString() would crash so badly // for java packages value.toString() would crash so badly
// that we cannot even try/catch it // that we cannot even try/catch it
if (/^\[JavaPackage.*\]$/.test(arg)) if (/^\[JavaPackage.*\]$/.test(arg))
return "[JavaPackage]"; return "[JavaPackage]";
var str = arg.toString(); var str = arg.toString();
if (typeof str == "string") // can be "undefined" if (typeof str == "string") // can be "undefined"
return vimperator.util.escapeHTML(str); return vimperator.util.escapeHTML(str);
else else
return "undefined"; return "undefined";
}
}
catch (e)
{
return "&lt;unknown&gt;";
} }
return arg; return "&lt;unknown type&gt;";
}, },
// takes a string like 'google bla, www.osnews.com' // takes a string like 'google bla, www.osnews.com'
@@ -160,7 +168,7 @@ vimperator.util = {
highlightURL: function (str, force) highlightURL: function (str, force)
{ {
if (force || /^[a-zA-Z]+:\/\/.*\//.test(str)) if (force || /^[a-zA-Z]+:\/\//.test(str))
return "<a class='hl-URL' href='" + str + "'>" + vimperator.util.escapeHTML(str) + "</a>"; return "<a class='hl-URL' href='" + str + "'>" + vimperator.util.escapeHTML(str) + "</a>";
else else
return str; return str;