mirror of
https://github.com/gryf/pentadactyl-pm.git
synced 2025-12-22 13:17:58 +01:00
improvements in :echo object, :echo getBrowser() should work now reliable
This commit is contained in:
@@ -41,40 +41,48 @@ vimperator.util = {
|
||||
{
|
||||
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>";
|
||||
}
|
||||
else if (type == "string")
|
||||
{
|
||||
if (process_strings)
|
||||
arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
|
||||
if (type == "number")
|
||||
{
|
||||
return "<span style=\"color: red;\">" + arg + "</span>";
|
||||
}
|
||||
else if (type == "string")
|
||||
{
|
||||
if (process_strings)
|
||||
arg = '"' + vimperator.util.escapeHTML(arg.replace(/\n/, "\\n")) + '"';
|
||||
|
||||
return "<span style=\"color: green;\">" + arg + "</span>";
|
||||
}
|
||||
else if (type == "boolean")
|
||||
{
|
||||
return "<span style=\"color: blue;\">" + arg + "</span>";
|
||||
}
|
||||
else if (arg == null || arg == "undefined")
|
||||
{
|
||||
return "<span style=\"color: blue;\">" + arg + "</span>";
|
||||
}
|
||||
else if (type == "object" || type == "function")
|
||||
{
|
||||
// for java packages value.toString() would crash so badly
|
||||
// that we cannot even try/catch it
|
||||
if (/^\[JavaPackage.*\]$/.test(arg))
|
||||
return "[JavaPackage]";
|
||||
return "<span style=\"color: green;\">" + arg + "</span>";
|
||||
}
|
||||
else if (type == "boolean")
|
||||
{
|
||||
return "<span style=\"color: blue;\">" + arg + "</span>";
|
||||
}
|
||||
else if (arg == null || arg == "undefined")
|
||||
{
|
||||
return "<span style=\"color: blue;\">" + arg + "</span>";
|
||||
}
|
||||
else if (type == "object" || type == "function")
|
||||
{
|
||||
// for java packages value.toString() would crash so badly
|
||||
// that we cannot even try/catch it
|
||||
if (/^\[JavaPackage.*\]$/.test(arg))
|
||||
return "[JavaPackage]";
|
||||
|
||||
var str = arg.toString();
|
||||
if (typeof str == "string") // can be "undefined"
|
||||
return vimperator.util.escapeHTML(str);
|
||||
else
|
||||
return "undefined";
|
||||
var str = arg.toString();
|
||||
if (typeof str == "string") // can be "undefined"
|
||||
return vimperator.util.escapeHTML(str);
|
||||
else
|
||||
return "undefined";
|
||||
}
|
||||
}
|
||||
catch (e)
|
||||
{
|
||||
return "<unknown>";
|
||||
}
|
||||
|
||||
return arg;
|
||||
return "<unknown type>";
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user