gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 16:32:27 +01:00
Code Issues Projects Releases Wiki Activity

Make objectToString work better with generators and arrays

Browse Source
This commit is contained in:
Kris Maglione
2008-11-01 19:10:28 +00:00
parent dcff71b235
commit 6be68bad2c
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
content/ui.js
View File

@@ -310,12 +310,8 @@ function CommandLine() //{{{
if (typeof arg === "object")
arg = util.objectToString(arg, useColor);
else if (typeof arg === "function")
arg = util.escapeHTML(arg.toString());
else if (typeof arg === "number" || typeof arg === "boolean")
arg = "" + arg;
else if (typeof arg === "undefined")
arg = "undefined";
else if (typeof arg != "xml")
arg = String(arg);
return arg;
}

41
content/util.js
View File

@@ -287,6 +287,7 @@ const util = { //{{{
* when they expect :map <C-f> :foo.
*/
XML.prettyPrinting = false;
XML.ignoreWhitespace = false;
if (object === null)
return "null";
@@ -294,45 +295,53 @@ const util = { //{{{
if (typeof object != "object")
return false;
var string = "";
var obj = "";
try
{ // for window.JSON
obj = object.toString();
var obj = String(object);
}
catch (e)
{
obj = "<Object>";
obj = "[Object]";
}
if (color)
obj = <span class="hl-Title hl-Object">{obj}</span>.toXMLString();
string += obj + "::\n";
let string = <><span class="hl-Title hl-Object">{obj}</span>::<br/>&#xa;</>;
let keys = [];
try // window.content often does not want to be queried with "var i in object"
{
let hasValue = !("__iterator__" in object);
for (let i in object)
{
let value = "<no value>";
let value = <![CDATA[<no value>]]>;
try
{
value = object[i];
}
catch (e) {}
value = template.highlight(value, true);
if (color)
if (!hasValue)
{
value = value.toXMLString();
i = <span style="font-weight: bold;">{i}</span>.toXMLString();
if(i instanceof Array && i.length == 2)
[i, value] = i;
else
var noVal = true;
}
keys.push(i + ": " + value);
value = template.highlight(value, true);
// FIXME: Inline style.
key = <span style="font-weight: bold;">{i}</span>;
if (!isNaN(i))
i = parseInt(i);
keys.push([i, <>{key}{noVal ? "" : <>:{value}</>}<br/>&#xa;</>]);
}
}
catch (e) {}
return string + keys.sort().join("\n") + "\n";
function compare(a, b)
{
if (!isNaN(a[0]) && !isNaN(b[0]))
return a[0] - b[0];
return String.localeCompare(a, b);
}
string += template.map(keys.sort(compare), function (f) f[1]);
return color ? string : [s for each (s in string)].join("");
},
range: function (start, end)