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

Replace horrible chrome-data URLs with somewhat more comprehensible dactyl://style/ URLs.

Browse Source
This commit is contained in:
Kris Maglione
2011-02-02 11:14:10 -05:00
parent 5576a5f5e6
commit c9bdbe3391
3 changed files with 45 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
common/modules/config.jsm
View File

@@ -13,7 +13,7 @@ Components.utils.import("resource://dactyl/bootstrap.jsm");
defineModule("config", {
exports: ["ConfigBase", "Config", "config"],
require: ["highlight", "services", "storage", "util", "template"],
use: ["io"]
use: ["highlight", "io"]
}, this);
var ConfigBase = Class("ConfigBase", {
@@ -23,19 +23,21 @@ var ConfigBase = Class("ConfigBase", {
*/
init: function init() {
highlight.styleableChrome = this.styleableChrome;
highlight.loadCSS(this.CSS);
highlight.loadCSS(this.helpCSS);
if (!util.haveGecko("2b"))
highlight.loadCSS(<![CDATA[
!TabNumber font-weight: bold; margin: 0px; padding-right: .8ex;
!TabIconNumber {
font-weight: bold;
color: white;
text-align: center;
text-shadow: black -1px 0 1px, black 0 1px 1px, black 1px 0 1px, black 0 -1px 1px;
}
]]>);
this.timeout(function () {
highlight.styleableChrome = this.styleableChrome;
highlight.loadCSS(this.CSS);
highlight.loadCSS(this.helpCSS);
if (!util.haveGecko("2b"))
highlight.loadCSS(<![CDATA[
!TabNumber font-weight: bold; margin: 0px; padding-right: .8ex;
!TabIconNumber {
font-weight: bold;
color: white;
text-align: center;
text-shadow: black -1px 0 1px, black 0 1px 1px, black 1px 0 1px, black 0 -1px 1px;
}
]]>);
});
this.features.push = deprecated("set.add", function push(feature) set.add(this, feature));
if (util.haveGecko("2b"))

27
common/modules/styles.jsm
View File

@@ -38,23 +38,22 @@ update(Sheet.prototype, {
remove: function () { this.hive.remove(this); },
get uri() cssUri(this.fullCSS),
get uri() "dactyl://style/" + this.id + "/" + this.hive.name + "/" + (this.name || ""),
get enabled() this._enabled,
set enabled(on) {
if (on != this._enabled || this.uri != this._uri) {
if (on != this._enabled || this.fullCSS != this._fullCSS) {
if (on)
this.enabled = false;
else if (!this._uri)
return;
let meth = on ? "registerSheet" : "unregisterSheet";
styles[meth](on ? this.uri : this._uri,
on ? this.agent : this._agent);
styles[meth](this.uri, on ? this.agent : this._agent);
this._agent = this.agent;
this._enabled = Boolean(on);
this._uri = this.uri;
this._fullCSS = this.fullCSS;
}
},
@@ -82,7 +81,8 @@ update(Sheet.prototype, {
});
var Hive = Class("Hive", {
init: function () {
init: function (name) {
this.name = name;
this.sheets = [];
this.names = {};
},
@@ -125,6 +125,8 @@ var Hive = Class("Hive", {
this.sheets.push(sheet);
}
styles.allSheets[sheet.id] = sheet;
if (!lazy)
sheet.enabled = true;
@@ -208,6 +210,7 @@ var Hive = Class("Hive", {
sheet.enabled = false;
if (sheet.name)
delete this.names[sheet.name];
delete styles.allSheets[sheet.id];
}
this.sheets = this.sheets.filter(function (s) matches.indexOf(s) == -1);
return matches.length;
@@ -224,8 +227,16 @@ try {
var Styles = Module("Styles", {
init: function () {
this._id = 0;
this.user = Hive();
this.system = Hive();
this.user = Hive("user");
this.system = Hive("system");
this.allSheets = {};
services["dactyl:"].providers["style"] = function styleProvider(uri) {
let id = /^\/(\d*)/.exec(uri.path)[1];
if (set.has(styles.allSheets, id))
return ["text/css", styles.allSheets[id].fullCSS];
return null;
};
},
cleanup: function cleanup() {