diff --git a/common/bootstrap.js b/common/bootstrap.js index e84b7a6d..30637ee9 100755 --- a/common/bootstrap.js +++ b/common/bootstrap.js @@ -32,6 +32,7 @@ function reportError(e) { function httpGet(url) { let xmlhttp = Cc["@mozilla.org/xmlextras/xmlhttprequest;1"].createInstance(Ci.nsIXMLHttpRequest); + xmlhttp.overrideMimeType("text/plain"); xmlhttp.open("GET", url, false); xmlhttp.send(null); return xmlhttp; diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js index 9bec779b..f7174707 100644 --- a/common/content/bookmarks.js +++ b/common/content/bookmarks.js @@ -520,8 +520,8 @@ var Bookmarks = Module("bookmarks", { commandline.input("This will delete all bookmarks. Would you like to continue? (yes/[no]) ", function (resp) { if (resp && resp.match(/^y(es)?$/i)) { - Object.keys(bookmarkcache.bookmarks).forEach(function (id) { services.bookmarks.removeItem(id); }); - dactyl.echomsg("All bookmarks deleted", 1, commandline.FORCE_SINGLELINE); + bookmarks.remove(Object.keys(bookmarkcache.bookmarks)); + dactyl.echomsg("All bookmarks deleted"); } }); else { @@ -534,8 +534,7 @@ var Bookmarks = Module("bookmarks", { var deletedCount = bookmarks.remove(context.allItems.items.map(function (item) item.item.id)); } - dactyl.echomsg({ message: deletedCount + " bookmark(s) deleted" }, - 1, commandline.FORCE_SINGLELINE); + dactyl.echomsg({ message: deletedCount + " bookmark(s) deleted" }); } }, diff --git a/common/content/commandline.js b/common/content/commandline.js index ba7616d7..0ffd2bbe 100644 --- a/common/content/commandline.js +++ b/common/content/commandline.js @@ -430,7 +430,7 @@ var CommandExMode = Class("CommandExMode", CommandMode, { var CommandPromptMode = Class("CommandPromptMode", CommandMode, { init: function init(prompt, params) { - this.prompt = prompt; + this.prompt = isArray(prompt) ? prompt : ["Question", prompt]; update(this, params); init.supercall(this); }, @@ -752,7 +752,7 @@ var CommandLine = Module("commandline", { input: function _input(prompt, callback, extra) { extra = extra || {}; - CommandPromptMode(prompt, extra).open(); + CommandPromptMode(prompt, update({ onSubmit: callback }, extra)).open(); }, readHeredoc: function readHeredoc(end) { diff --git a/common/modules/util.jsm b/common/modules/util.jsm index 94b3efaa..02d4b1dd 100644 --- a/common/modules/util.jsm +++ b/common/modules/util.jsm @@ -760,14 +760,21 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]), * @returns {XMLHttpRequest} */ httpGet: function httpGet(url, callback, self) { + let params = callback; + if (!isObject(params)) + params = { callback: params && function () callback.apply(self, arguments) }; + try { let xmlhttp = services.Xmlhttp(); xmlhttp.mozBackgroundRequest = true; - if (callback) { - xmlhttp.onload = function handler(event) { util.trapErrors(callback, self, xmlhttp, event) }; + if (params.callback) { + xmlhttp.onload = function handler(event) { util.trapErrors(params.callback, params, xmlhttp, event) }; xmlhttp.onerror = xmlhttp.onload; } - xmlhttp.open("GET", url, !!callback); + if (params.mimeType) + xmlhttp.overrideMimeType(params.mimeType); + + xmlhttp.open(params.method || "GET", url, !!params.callback, params.user, params.pass); xmlhttp.send(null); return xmlhttp; }