From 0a3ec8c768166cc6dc4791249e2680e910cb384e Mon Sep 17 00:00:00 2001
From: Kris Maglione <maglione.k@gmail.com>
Date: Sat, 20 Nov 2010 16:03:21 -0500
Subject: [PATCH] Make the silly ':hi Bell display:none;' hack function again.

---
 common/content/commandline.js | 16 +++-------------
 common/content/commands.js    |  2 +-
 common/content/dactyl.js      | 23 +++++++++--------------
 common/content/tabs.js        |  4 ++--
 4 files changed, 15 insertions(+), 30 deletions(-)

diff --git a/common/content/commandline.js b/common/content/commandline.js
index 0f900c37..c58b894a 100644
--- a/common/content/commandline.js
+++ b/common/content/commandline.js
@@ -1583,19 +1583,11 @@ const CommandLine = Module("commandline", {
         if (!arg)
             return "";
 
-        try {
-            arg = dactyl.userEval(arg);
-        }
-        catch (e) {
-            dactyl.echoerr(e);
-            return null;
-        }
-
-        if (typeof arg === "object")
+        arg = dactyl.userEval(arg);
+        if (isObject(arg))
             arg = util.objectToString(arg, useColor);
         else
             arg = String(arg);
-
         return arg;
     }
 }, {
@@ -1620,9 +1612,7 @@ const CommandLine = Module("commandline", {
             commands.add([command.name],
                 command.description,
                 function (args) {
-                    let str = CommandLine.echoArgumentToString(args[0] || "", true);
-                    if (str != null)
-                        command.action(str);
+                    command.action(CommandLine.echoArgumentToString(args[0] || "", true));
                 }, {
                     completer: function (context) completion.javascript(context),
                     literal: 0
diff --git a/common/content/commands.js b/common/content/commands.js
index 478b5263..4593cd1c 100644
--- a/common/content/commands.js
+++ b/common/content/commands.js
@@ -147,7 +147,7 @@ const Command = Class("Command", {
         if (args.bang && !this.bang)
             throw FailedAssertion("E477: No ! allowed");
 
-        dactyl.trapErrors(function exec(command) {
+        return !dactyl.trapErrors(function exec(command) {
             if (this.always)
                 this.always(args, modifiers);
             if (!io.sourcing || !io.sourcing.noExecute)
diff --git a/common/content/dactyl.js b/common/content/dactyl.js
index ed6fd896..fc3f3e67 100644
--- a/common/content/dactyl.js
+++ b/common/content/dactyl.js
@@ -143,10 +143,10 @@ const Dactyl = Module("dactyl", {
             let strut = document.getElementById("dactyl-bell-strut");
             if (!bell) {
                 bell = document.documentElement.insertBefore(
-                    util.xmlToDom(<hbox xmlns={XUL} style="display: none" id="dactyl-bell" highlight="Bell"/>, document),
+                    util.xmlToDom(<hbox xmlns={XUL} style="display: none" highlight="Bell" id="dactyl-bell"/>, document),
                     document.documentElement.firstChild);
                 strut = document.documentElement.appendChild(
-                    util.xmlToDom(<hbox xmlns={XUL} style="display: none" id="dactyl-bell-strut"/>, document));
+                    util.xmlToDom(<hbox xmlns={XUL} style="display: none" highlight="Bell" id="dactyl-bell-strut"/>, document));
             }
 
             bell.style.height = window.innerHeight + "px";
@@ -335,12 +335,14 @@ const Dactyl = Module("dactyl", {
 
         if (!silent)
             commandline.command = str.replace(/^\s*:\s*/, "");
+        let res = true;
         for (let [command, args] in commands.parseCommands(str.replace(/^'(.*)'$/, "$1"))) {
             if (command === null)
                 throw FailedAssertion("E492: Not a " + config.appName + " command: " + args.commandString);
 
-            command.execute(args, modifiers);
+            res = res && command.execute(args, modifiers);
         }
+        return res;
     },
 
     /**
@@ -1006,7 +1008,7 @@ const Dactyl = Module("dactyl", {
         }
         catch (e) {
             dactyl.reportError(e, true);
-            return undefined;
+            return e;
         }
     },
 
@@ -1711,18 +1713,11 @@ const Dactyl = Module("dactyl", {
         commands.add(["javas[cript]", "js"],
             "Evaluate a JavaScript string",
             function (args) {
-                if (args.bang) { // open JavaScript console
+                if (args.bang) // open JavaScript console
                     dactyl.open("chrome://global/content/console.xul",
                         { from: "javascript" });
-                }
-                else {
-                    try {
-                        dactyl.userEval(args[0]);
-                    }
-                    catch (e) {
-                        dactyl.echoerr(e);
-                    }
-                }
+                else
+                    dactyl.userEval(args[0]);
             }, {
                 bang: true,
                 completer: function (context) completion.javascript(context),
diff --git a/common/content/tabs.js b/common/content/tabs.js
index 97d7ee9a..e7f61829 100644
--- a/common/content/tabs.js
+++ b/common/content/tabs.js
@@ -569,7 +569,6 @@ const Tabs = Module("tabs", {
                 subCommand: 0
             });
 
-        // TODO: this should open in a new tab positioned directly after the current one, not at the end
         commands.add(["tab"],
             "Execute a command and tell it to output in a new tab",
             function (args) {
@@ -589,7 +588,8 @@ const Tabs = Module("tabs", {
             function (args) {
                 for (let i = 0; i < tabs.count; i++) {
                     tabs.select(i);
-                    dactyl.execute(args[0] || "", null, true);
+                    if (!dactyl.execute(args[0] || "", null, true))
+                        break;
                 }
             }, {
                 argCount: "1",