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

Allow recursive :hi linking.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-29 23:09:29 -05:00
parent 8d8df1e53e
commit 538b91719e
1 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/modules/highlight.jsm
+22 -8
View File
@@ -60,7 +60,17 @@ update(Highlight.prototype, {
get bases() array.compact(this.extends.map(function (name) highlight.get(name))), get bases() array.compact(this.extends.map(function (name) highlight.get(name))),
get inheritedCSS() this.bases.map(function (b) b.value.replace(/;?\s*$/, "; ")).join(""), get inheritedCSS() {
if (this.gettingCSS)
return "";
try {
this.gettingCSS = true;
return this.bases.map(function (b) (b.inheritedCSS + b.value).replace(/;?\s*$/, "; ")).join("");
}
finally {
this.gettingCSS = false;
}
},
get css() this.selector + "{" + this.inheritedCSS + this.value + "}", get css() this.selector + "{" + this.inheritedCSS + this.value + "}",
@@ -128,15 +138,15 @@ var Highlights = Module("Highlight", {
let highlight = this.highlight[key] || this._create(false, [key]); let highlight = this.highlight[key] || this._create(false, [key]);
extend = extend || highlight.extend; let extends = extend || highlight.extend;
if (append) { if (append) {
newStyle = Styles.append(highlight.value || "", newStyle); newStyle = Styles.append(highlight.value || "", newStyle);
extend = highlight.extends.concat(extend); extends = highlight.extends.concat(extends);
} }
if (/^\s*$/.test(newStyle)) if (/^\s*$/.test(newStyle))
newStyle = null; newStyle = null;
if (newStyle == null) { if (newStyle == null && extend == null) {
if (highlight.default == null && highight.defaultExtends.length == 0) { if (highlight.default == null && highight.defaultExtends.length == 0) {
highlight.style.enabled = false; highlight.style.enabled = false;
delete this.loaded[highlight.class]; delete this.loaded[highlight.class];
@@ -144,11 +154,11 @@ var Highlights = Module("Highlight", {
return null; return null;
} }
newStyle = highlight.default; newStyle = highlight.default;
extend = highlight.defaultExtends; extends = highlight.defaultExtends;
} }
highlight.set("value", newStyle); highlight.set("value", newStyle || "");
highlight.extends = array.uniq(extend, true); highlight.extends = array.uniq(extends, true);
if (force) if (force)
highlight.style.enabled = true; highlight.style.enabled = true;
this.highlight[highlight.class] = highlight; this.highlight[highlight.class] = highlight;
@@ -295,9 +305,13 @@ var Highlights = Module("Highlight", {
args.shift(); args.shift();
let [key, css] = args; let [key, css] = args;
dactyl.assert(!(clear && css), "E488: Trailing characters");
let modify = css || clear || args["-append"] || args["-link"]; let modify = css || clear || args["-append"] || args["-link"];
if (!modify && /&$/.test(key))
[clear, modify, key] = [true, true, key.replace(/&$/, "")];
dactyl.assert(!(clear && css), "E488: Trailing characters");
if (!modify) if (!modify)
modules.commandline.commandOutput( modules.commandline.commandOutput(
template.tabular(["Key", "Sample", "CSS"], template.tabular(["Key", "Sample", "CSS"],