From e804d51448a16e22d44afada50f28afdc588047d Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Tue, 28 Dec 2010 17:20:28 -0500
Subject: [PATCH] Fix activating scrollable elements via ;F.

--HG--
branch : bootstrapped
---
 common/content/buffer.js  |  7 ++++++-
 common/modules/styles.jsm | 28 +++++++++-------------------
 2 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/common/content/buffer.js b/common/content/buffer.js
index f5e0725b..bd468b65 100644
--- a/common/content/buffer.js
+++ b/common/content/buffer.js
@@ -539,7 +539,12 @@ var Buffer = Module("buffer", {
             buffer.lastInputField = elem;
         }
         else {
-            dactyl.focus(elem);
+            if (isinstance(elem, [HTMLInputElement, XULTextBoxElement]))
+                var flags = services.focus.FLAG_BYMOUSE;
+            else
+                flags = services.focus.FLAG_SHOWRING;
+            dactyl.focus(elem, flags);
+
             if (elem instanceof Window) {
                 let sel = elem.getSelection();
                 if (sel && !sel.rangeCount)
diff --git a/common/modules/styles.jsm b/common/modules/styles.jsm
index 01d3b7c3..b31df65a 100644
--- a/common/modules/styles.jsm
+++ b/common/modules/styles.jsm
@@ -363,31 +363,21 @@ var Styles = Module("Styles", {
     commands: function (dactyl, modules, window) {
         const commands = modules.commands;
 
-        const queue = [];
-        const timer = Timer(10, 10, function () {
-            let args = queue.shift()
-            let [filter, css] = args;
-            if ("-append" in args) {
-                let sheet = styles.user.get(args["-name"]);
-                if (sheet) {
-                    filter = sheet.sites.concat(filter).join(",");
-                    css = sheet.css + " " + css;
-
-                }
-            }
-            styles.user.add(args["-name"], filter, css, args["-agent"]);
-
-            if (queue.length)
-                timer.tell();
-        });
         commands.add(["sty[le]"],
             "Add or list user styles",
             function (args) {
                 let [filter, css] = args;
 
                 if (css) {
-                    queue.push(args);
-                    timer.tell(args);
+                    if ("-append" in args) {
+                        let sheet = styles.user.get(args["-name"]);
+                        if (sheet) {
+                            filter = sheet.sites.concat(filter).join(",");
+                            css = sheet.css + " " + css;
+
+                        }
+                    }
+                    styles.user.add(args["-name"], filter, css, args["-agent"]);
                 }
                 else {
                     let list = styles.user.sheets.slice()