SDK: Commands: Ensure we're using the right window object

(integrated from master branch change 9.2.1-270-ga334147 by Nathan Rijksen <[email protected]>)
delkyd · Sep 14, 2015 · 2bfabf2 · 2bfabf2
1 parent 69dac1f
commit 2bfabf2
Showing 1 changed file with 10 additions and 5 deletions.
diff --git a/src/chrome/komodo/content/sdk/commands.js b/src/chrome/komodo/content/sdk/commands.js
@@ -10,7 +10,7 @@
  const {Cc, Ci, Cu} = require("chrome");
  const $ = require("ko/dom");
  const prefs = ko.prefs;
- const keybinds = require("ko/keybindings");
+ const _window  = require("ko/windows").getMain();
 
  const log = require("ko/logging").getLogger("ko-commands");
  //log.setLevel(require("ko/logging").LOG_DEBUG);
@@ -22,7 +22,7 @@
  */
  var init = () =>
  {
- window.controllers.appendController(controller);
+ _window.controllers.appendController(controller);
  }
 
  /**
@@ -72,18 +72,21 @@
  if (document.getElementById(commandName))
  throw new this.exceptionAlreadyUsed;
 
- var commandNode = $("<command/>");
+ var commandNode = $("<command/>", _window);
  commandNode.attr({
  id: commandName,
  key: "key_" + commandName,
  onCommand: "ko.commands.doCommandAsync('"+commandName+"', event)",
  desc: opts.label || commandName
  });
- $("#allcommands").append(commandNode);
+ $("#allcommands", _window).append(commandNode);
 
  log.debug(("defaultBind" in opts));
  if (("defaultBind" in opts) && opts.defaultBind)
+ {
+ var keybinds = require("ko/keybindings");
  keybinds.register(commandName, opts.defaultBind, opts.forceBind);
+ }
 
  local.registered[commandName] = {
  command: command,
@@ -109,9 +112,11 @@
 
  var opts = local.registered[commandName].opts;
  var label = local.registered[commandName].opts.label || commandName;
+
+ var keybinds = require("ko/keybindings");
  keybinds.unregister(commandName,label);
 
- $("#"+commandName).remove();
+ $("#"+commandName, _window).remove();
  delete local.registered[commandName];
  }