gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-15 21:05:48 +01:00
Code Issues Projects Releases Wiki Activity

Merge default.

Browse Source 
--HG--
branch : key-processing
This commit is contained in:
Kris Maglione
2011-01-25 16:20:22 -05:00
parent fd9319726d ec42ad5a5a
commit 9ad1cbef58
11 changed files with 42 additions and 263 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/modules/highlight.jsm
View File

@@ -145,10 +145,10 @@ var Highlights = Module("Highlight", {
let highlight = this.highlight[key] || this._create(false, [key]);
let extends = extend || highlight.extend;
let bases = extend || highlight.extend;
if (append) {
newStyle = Styles.append(highlight.value || "", newStyle);
extends = highlight.extends.concat(extends);
bases = highlight.extends.concat(bases);
}
if (/^\s*$/.test(newStyle))
@@ -161,11 +161,11 @@ var Highlights = Module("Highlight", {
return null;
}
newStyle = highlight.defaultValue;
extends = highlight.defaultExtends;
bases = highlight.defaultExtends;
}
highlight.set("value", newStyle || "");
highlight.extends = array.uniq(extends, true);
highlight.extends = array.uniq(bases, true);
if (force)
highlight.style.enabled = true;
this.highlight[highlight.class] = highlight;