1
0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 03:17:58 +01:00

nsITimer is bloody insane.

This commit is contained in:
Kris Maglione
2011-10-19 07:16:15 -04:00
parent e75de734ed
commit be3218dcfb
3 changed files with 11 additions and 6 deletions

View File

@@ -852,7 +852,8 @@ var Tabs = Module("tabs", {
commands.add(["tabopen", "t[open]", "tabnew"],
"Open one or more URLs in a new tab",
function (args) {
dactyl.open(args[0] || "about:blank", { from: "tabopen", where: dactyl.NEW_TAB, background: args.bang });
dactyl.open(args[0] || "about:blank",
{ from: "tabopen", where: dactyl.NEW_TAB, background: args.bang });
}, {
bang: true,
completer: function (context) completion.url(context),

View File

@@ -972,10 +972,14 @@ Class.prototype = {
if (self.stale ||
util.rehashing && !isinstance(Cu.getGlobalForObject(callback), ["BackstagePass"]))
return;
self.timeouts.splice(self.timeouts.indexOf(timer), 1);
util.trapErrors(callback, self);
}
return services.Timer(timeout_notify, timeout || 0, services.Timer.TYPE_ONE_SHOT);
let timer = services.Timer(timeout_notify, timeout || 0, services.Timer.TYPE_ONE_SHOT);
this.timeouts.push(timer);
return timer;
},
timeouts: [],
/**
* Updates this instance with the properties of the given objects.

View File

@@ -102,7 +102,7 @@ var JavaScript = Module("javascript", {
let completions = [k for (k in this.iter(obj, toplevel))];
if (obj === this.modules) // Hack.
completions = completions.concat([k for (k in this.iter(this.modules.jsmodules, toplevel))]);
completions = array.uniq(completions.concat([k for (k in this.iter(this.modules.jsmodules, toplevel))]));
return completions;
},
@@ -620,10 +620,10 @@ var JavaScript = Module("javascript", {
* enumerable by any standard method.
*/
globalNames: Class.Memoize(function () let (self = this) array.uniq([
"Array", "ArrayBuffer", "AttributeName", "Boolean", "Components",
"Array", "ArrayBuffer", "AttributeName", "Audio", "Boolean", "Components",
"CSSFontFaceStyleDecl", "CSSGroupRuleRuleList", "CSSNameSpaceRule",
"CSSRGBColor", "CSSRect", "ComputedCSSStyleDeclaration", "Date",
"Error", "EvalError", "Float32Array", "Float64Array", "Function",
"CSSRGBColor", "CSSRect", "ComputedCSSStyleDeclaration", "Date", "Error",
"EvalError", "File", "Float32Array", "Float64Array", "Function",
"HTMLDelElement", "HTMLInsElement", "HTMLSpanElement", "Infinity",
"InnerModalContentWindow", "InnerWindow", "Int16Array", "Int32Array",
"Int8Array", "InternalError", "Iterator", "JSON", "KeyboardEvent",