gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-01-03 11:24:12 +01:00
Code Issues Projects Releases Wiki Activity

Make isinstance() and template.highlight Symbol aware.

Browse Source
This commit is contained in:
Doug Kearns
2015-06-18 18:20:48 +10:00
parent cd7a8eeda9
commit d3cb216478
3 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common/modules/base.jsm
View File

@@ -646,7 +646,8 @@ var isinstance_types = {
boolean: Boolean, boolean: Boolean,
string: String, string: String,
function: Function, function: Function,
number: Number number: Number,
symbol: Symbol
}; };
function isinstance(object, interfaces) { function isinstance(object, interfaces) {
if (object == null) if (object == null)

7
common/modules/template.jsm
View File

@@ -284,10 +284,13 @@ var Template = Module("Template", {
if (processStrings) if (processStrings)
str = JSON.stringify(str); str = JSON.stringify(str);
return ["span", { highlight: "String" }, str]; return ["span", { highlight: "String" }, str];
case "symbol":
return ["span", { highlight: "Symbol" }, str];
case "boolean": case "boolean":
return ["span", { highlight: "Boolean" }, str]; return ["span", { highlight: "Boolean" }, str];
case "function": case "function":
if (arg instanceof Ci.nsIDOMElement) // wtf? // See: https://bugzil.la/268945
if (arg instanceof Ci.nsIDOMElement)
return util.objectToString(arg, !bw); return util.objectToString(arg, !bw);
str = str.replace("/* use strict */ \n", "/* use strict */ "); str = str.replace("/* use strict */ \n", "/* use strict */ ");
@@ -310,8 +313,6 @@ var Template = Module("Template", {
{ highlight: "NonText" }, { highlight: "NonText" },
"^J"]); "^J"]);
return ["span", { highlight: "Object" }, str]; return ["span", { highlight: "Object" }, str];
case "xml":
return arg;
default: default:
return "<unknown type>"; return "<unknown type>";
} }

1
common/skin/global-styles.css
View File

@@ -4,6 +4,7 @@ Null /* JavaScript null values */ color: blue;
Number /* JavaScript numbers */ color: blue; Number /* JavaScript numbers */ color: blue;
Object /* JavaScript objects */ color: maroon; Object /* JavaScript objects */ color: maroon;
String /* String values */ color: green; white-space: pre; String /* String values */ color: green; white-space: pre;
Symbol /* JavaScript symbols */ color: darkcyan;
Comment /* JavaScriptor CSS comments */ color: gray; Comment /* JavaScriptor CSS comments */ color: gray;
Key /* Keywords */ font-weight: bold; Key /* Keywords */ font-weight: bold;