gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 05:27:58 +01:00
Code Issues Projects Releases Wiki Activity

nsITimer is bloody insane.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

3
common/content/tabs.js
View File

@@ -852,7 +852,8 @@ var Tabs = Module("tabs", {
commands.add(["tabopen", "t[open]", "tabnew"], commands.add(["tabopen", "t[open]", "tabnew"],
"Open one or more URLs in a new tab", "Open one or more URLs in a new tab",
function (args) { 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, bang: true,
completer: function (context) completion.url(context), completer: function (context) completion.url(context),

6
common/modules/base.jsm
View File

@@ -972,10 +972,14 @@ Class.prototype = {
if (self.stale || if (self.stale ||
util.rehashing && !isinstance(Cu.getGlobalForObject(callback), ["BackstagePass"])) util.rehashing && !isinstance(Cu.getGlobalForObject(callback), ["BackstagePass"]))
return; return;
self.timeouts.splice(self.timeouts.indexOf(timer), 1);
util.trapErrors(callback, self); 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. * Updates this instance with the properties of the given objects.

8
common/modules/javascript.jsm
View File

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