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

Fix help on FF3, overly long URL chains in context filenames, etc.

Browse Source
This commit is contained in:
Kris Maglione
2011-01-13 18:26:27 -05:00
parent 3e85415890
commit f0dbc8f2f0
8 changed files with 23 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
common/modules/bootstrap.jsm
View File

@@ -5,7 +5,6 @@
"use strict";
try {
dump("=========== load bootstrap.jsm ===========\n");
if (!JSMLoader || JSMLoader.bump != 1)
var JSMLoader = {
@@ -16,6 +15,7 @@ if (!JSMLoader || JSMLoader.bump != 1)
factories: [],
globals: {},
io: Components.classes["@mozilla.org/network/io-service;1"].getService(Components.interfaces.nsIIOService),
loader: Components.classes["@mozilla.org/moz/jssubscript-loader;1"].getService(Components.interfaces.mozIJSSubScriptLoader),
manager: Components.manager.QueryInterface(Components.interfaces.nsIComponentRegistrar),
stale: {},
suffix: "",
@@ -29,17 +29,13 @@ if (!JSMLoader || JSMLoader.bump != 1)
if (url.indexOf(":") === -1)
url = "resource://dactyl" + this.suffix + "/" + url;
let stale = this.stale[url];
if (stale) {
dump("JSMLoader: load " + name + " " + stale + "\n");
dump("JSMLoader: load " + name + " " + this.getTarget(url) + "\n");
if (url in this.stale) {
let stale = this.stale[url];
delete this.stale[url];
let global = this.globals[url];
if (stale === this.getTarget(url))
Components.classes["@mozilla.org/moz/jssubscript-loader;1"]
.getService(Components.interfaces.mozIJSSubScriptLoader)
.loadSubScript(url, global.global || global);
this.loadSubScript(url, global.global || global);
}
try {
@@ -58,6 +54,7 @@ if (!JSMLoader || JSMLoader.bump != 1)
throw e;
}
},
loadSubScript: function loadSubScript() this.loader.loadSubScript.apply(this.loader, arguments),
cleanup: function unregister() {
for each (let factory in this.factories.splice(0))
this.manager.unregisterFactory(factory.classID, factory);
@@ -94,6 +91,6 @@ Components.classes["@mozilla.org/fuel/application;1"]
.storage.set("dactyl.JSMLoader", JSMLoader);
JSMLoader.load("base.jsm", this);
dump("exports: " + this.JSMLoader+" " +this.EXPORTED_SYMBOLS + "\n");
}catch(e){dump(e+"\n"+(e.stack || Error().stack));Components.utils.reportError(e)}
}catch(e){ dump(e + "\n" + (e.stack || Error().stack)); Components.utils.reportError(e) }

5
common/modules/config.jsm
View File

@@ -81,7 +81,8 @@ var ConfigBase = Class("ConfigBase", {
}
else {
return array(f.leafName
for (f in util.getFile(uri).iterDirectory())
// Fails on FF3: for (f in util.getFile(uri).iterDirectory())
for (f in values(util.getFile(uri).readDirectory()))
if (f.isDirectory())).array;
}
}),
@@ -636,7 +637,7 @@ var ConfigBase = Class("ConfigBase", {
]]></>)
});
services.subscriptLoader.loadSubScript("resource://dactyl-local-content/config.js", this);
JSMLoader.loadSubScript("resource://dactyl-local-content/config.js", this);
config.INIT = update(Object.create(config.INIT), config.INIT, {
init: function init(dactyl, modules, window) {

4
common/modules/overlay.jsm
View File

@@ -88,7 +88,7 @@ var Overlay = Module("Overlay", {
const create = window.Object.create || (function () {
window.__dactyl_eval_string = "(function (proto) ({ __proto__: proto }))";
services.subscriptLoader.loadSubScript(BASE + "eval.js", window);
JSMLoader.loadSubScript(BASE + "eval.js", window);
let res = window.__dactyl_eval_result;
delete window.__dactyl_eval_string;
@@ -110,7 +110,7 @@ var Overlay = Module("Overlay", {
load: function load(script) {
for (let [i, base] in Iterator(prefix)) {
try {
services.subscriptLoader.loadSubScript(base + script + ".js", modules, "UTF-8");
JSMLoader.loadSubScript(base + script + ".js", modules, "UTF-8");
return;
}
catch (e) {

2
common/modules/sanitizer.jsm
View File

@@ -21,7 +21,7 @@ defineModule("sanitizer", {
}, this);
let tmp = {};
services.subscriptLoader.loadSubScript("chrome://browser/content/sanitize.js", tmp);
JSMLoader.loadSubScript("chrome://browser/content/sanitize.js", tmp);
tmp.Sanitizer.prototype.__proto__ = Class.prototype;
var Range = Struct("min", "max");

2
common/modules/util.jsm
View File

@@ -24,7 +24,7 @@ default xml namespace = XHTML;
memoize(this, "Commands", function () {
// FIXME
let obj = { Module: Class };
services.subscriptLoader.loadSubScript("chrome://dactyl/content/commands.js", obj);
JSMLoader.loadSubScript("resource://dactyl-content/commands.js", obj);
return obj.Commands;
});