diff --git a/common/components/commandline-handler.js b/common/components/commandline-handler.js index 1190a87b..c0b9554c 100644 --- a/common/components/commandline-handler.js +++ b/common/components/commandline-handler.js @@ -39,7 +39,9 @@ CommandLineHandler.prototype = { catch (e) { dump(name + ": option '-" + name + "' requires an argument\n"); } - } + }, + + helpInfo: " -" + name + " " + " Additonal options for " + appName + " startup\n".substr(name.length) }; if (XPCOMUtils.generateNSGetFactory) diff --git a/common/content/bookmarks.js b/common/content/bookmarks.js index 5fbf3d64..1c46405b 100644 --- a/common/content/bookmarks.js +++ b/common/content/bookmarks.js @@ -111,23 +111,21 @@ const Bookmarks = Module("bookmarks", { }, // returns number of deleted bookmarks - remove: function remove(url) { + remove: function remove(ids) { try { - if (isArray(url)) - var bmarks = url; - else { + if (!isArray(ids)) { let uri = util.newURI(url); - var bmarks = services.get("bookmarks") - .getBookmarkIdsForURI(uri, {}) - .filter(bookmarkcache.closure.isRegularBookmark); + idw = services.get("bookmarks") + .getBookmarkIdsForURI(uri, {}) + .filter(bookmarkcache.closure.isRegularBookmark); } - bmarks.forEach(function (id) { + ids.forEach(function (id) { let bmark = bookmarkcache.bookmarks[id]; if (bmark) PlacesUtils.tagging.untagURI(util.newURI(bmark.url), null); services.get("bookmarks").removeItem(id); }); - return bmarks.length; + return ids.length; } catch (e) { dactyl.reportError(e, true);