gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-08 07:05:44 +01:00
Code Issues Projects Releases Wiki Activity

Merge changes from bootstrapped.

Browse Source
This commit is contained in:
Kris Maglione
2010-12-27 09:38:05 -05:00
parent 47167e769e
commit 7a0f693ad4
3 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
common/content/commandline.js
View File

@@ -408,7 +408,7 @@ var CommandLine = Module("commandline", {
set quiet(val) { set quiet(val) {
this._quiet = val; this._quiet = val;
["commandbar", "statusbar"].forEach(function (nodeSet) { ["commandbar", "statusbar"].forEach(function (nodeSet) {
Array.forEach(this.widgets[nodeSet].commandline.childNodes, function (node) { Array.forEach(this.widgets[nodeSet].commandline.children, function (node) {
node.style.opacity = this._quiet || this._silent ? "0" : ""; node.style.opacity = this._quiet || this._silent ? "0" : "";
}, this); }, this);
}, this); }, this);
@@ -828,11 +828,10 @@ var CommandLine = Module("commandline", {
let command = this.command; let command = this.command;
if (event.type == "blur") { if (event.type == "blur") {
// prevent losing focus, there should be a better way, but it just didn't work otherwise
this.timeout(function () { this.timeout(function () {
if (this.commandVisible && event.originalTarget == this.widgets.active.command.inputField) if (this.commandVisible && event.originalTarget == this.widgets.active.command.inputField)
dactyl.focus(this.widgets.active.command.inputField); dactyl.focus(this.widgets.active.command.inputField);
}, 0); });
} }
else if (event.type == "focus") { else if (event.type == "focus") {
if (!this.commandVisible && event.target == this.widgets.active.command.inputField) { if (!this.commandVisible && event.target == this.widgets.active.command.inputField) {

16
common/content/events.js
View File

@@ -241,15 +241,15 @@ var Events = Module("events", {
* @returns {boolean} * @returns {boolean}
*/ */
feedkeys: function (keys, noremap, quiet, mode) { feedkeys: function (keys, noremap, quiet, mode) {
let wasFeeding = this.feedingKeys;
this.feedingKeys = true;
this.duringFeed = this.duringFeed || [];
let wasQuiet = commandline.quiet;
if (quiet)
commandline.quiet = quiet;
try { try {
var wasFeeding = this.feedingKeys;
this.feedingKeys = true;
this.duringFeed = this.duringFeed || [];
var wasQuiet = commandline.quiet;
if (quiet)
commandline.quiet = quiet;
util.threadYield(1, true); util.threadYield(1, true);
for (let [, evt_obj] in Iterator(events.fromString(keys))) { for (let [, evt_obj] in Iterator(events.fromString(keys))) {

2
common/modules/util.jsm
View File

@@ -484,7 +484,7 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
*/ */
dumpStack: function dumpStack(msg, frames) { dumpStack: function dumpStack(msg, frames) {
let stack = util.stackLines(Error().stack); let stack = util.stackLines(Error().stack);
stack = stack.slice(2, 2 + (frames || 0)).join("\n"); stack = stack.slice(2, 2 + (frames || stack.length)).join("\n");
util.dump((arguments.length == 0 ? "Stack" : msg) + "\n" + stack + "\n"); util.dump((arguments.length == 0 ? "Stack" : msg) + "\n" + stack + "\n");
}, },