diff --git a/common/bootstrap.js b/common/bootstrap.js index 4f9dfbbc..c1027f7f 100755 --- a/common/bootstrap.js +++ b/common/bootstrap.js @@ -219,7 +219,7 @@ function init() { wrappedJSObject: {} }, createInstance: function () this.instance - }) + }); Cc[BOOTSTRAP_CONTRACT].getService().wrappedJSObject.loader = JSMLoader; diff --git a/common/components/protocols.js b/common/components/protocols.js index cf9959f0..94eab5d7 100644 --- a/common/components/protocols.js +++ b/common/components/protocols.js @@ -293,12 +293,12 @@ function XMLChannel(uri, contentType) { if (doctype) { this.writes.push(doctype + "[\n"); try { - this.writes.push(services.io.newChannel(url, null, null).open()) + this.writes.push(services.io.newChannel(url, null, null).open()); } catch (e) {} if (!open) this.writes.push("\n]"); - this.writes.push(post) + this.writes.push(post); } this.writes.push(channelStream); diff --git a/common/content/buffer.js b/common/content/buffer.js index 017e418a..c4b94124 100644 --- a/common/content/buffer.js +++ b/common/content/buffer.js @@ -180,9 +180,9 @@ var Buffer = Module("buffer", { yield ["Host", identity.getEffectiveHost()]; if (statusline.security === "extended") - yield ["Owner", data.subjectOrg] + yield ["Owner", data.subjectOrg]; else - yield ["Owner", _("pageinfo.s.ownerUnverified", data.subjectOrg)] + yield ["Owner", _("pageinfo.s.ownerUnverified", data.subjectOrg)]; if (location(data).length) yield ["Location", location(data)]; @@ -192,7 +192,7 @@ var Buffer = Module("buffer", { if (identity._overrideService.hasMatchingOverride(identity._lastLocation.hostname, (identity._lastLocation.port || 443), data.cert, {}, {})) - yield ["User exception", /*L*/"true"] + yield ["User exception", /*L*/"true"]; break; } }); diff --git a/common/content/commandline.js b/common/content/commandline.js index 149b5c33..e33e3627 100644 --- a/common/content/commandline.js +++ b/common/content/commandline.js @@ -852,7 +852,7 @@ var CommandLine = Module("commandline", { event.target.blur(); dactyl.beep(); } - }, + } } ), @@ -1246,7 +1246,7 @@ var CommandLine = Module("commandline", { for (let [, context] in Iterator(list)) { let done = function done() !(idx >= n + context.items.length || idx == -2 && !context.items.length); - util.waitFor(function () !context.incomplete || done()) + util.waitFor(function () !context.incomplete || done()); if (done()) break; diff --git a/common/content/hints.js b/common/content/hints.js index bb9505a3..da045ed0 100644 --- a/common/content/hints.js +++ b/common/content/hints.js @@ -1031,7 +1031,7 @@ var Hints = Module("hints", { onChange: function () { this.accepted = true; modes.pop(); - }, + } }); }, diff --git a/common/content/mappings.js b/common/content/mappings.js index 97042113..abb62bf4 100644 --- a/common/content/mappings.js +++ b/common/content/mappings.js @@ -649,7 +649,7 @@ var Mappings = Module("mappings", { validator: function (value) Array.concat(value).every(findMode), completer: function () [[array.compact([mode.name.toLowerCase().replace(/_/g, "-"), mode.char]), mode.description] for (mode in values(modes.all)) - if (!mode.hidden)], + if (!mode.hidden)] }; function findMode(name) { diff --git a/common/content/modes.js b/common/content/modes.js index 8eb76aab..523e6cc4 100644 --- a/common/content/modes.js +++ b/common/content/modes.js @@ -113,7 +113,7 @@ var Modes = Module("modes", { }); this.addMode("OUTPUT_MULTILINE", { description: "Active when the multi-line output buffer is open", - bases: [this.NORMAL], + bases: [this.NORMAL] }); this.addMode("INPUT", { @@ -267,7 +267,7 @@ var Modes = Module("modes", { let val = this._modeMap[this._main].display(); if (val) - return "-- " + val + " --" + macromode;; + return "-- " + val + " --" + macromode; return macromode; }, diff --git a/common/modules/addons.jsm b/common/modules/addons.jsm index 4deb144e..1cd67317 100644 --- a/common/modules/addons.jsm +++ b/common/modules/addons.jsm @@ -475,8 +475,8 @@ var Addons = Module("addons", { true)); }); } - } - } + }; + }; completion.extension = function extension(context, types) { context.title = ["Extension"]; diff --git a/common/modules/base.jsm b/common/modules/base.jsm index 0310cfc1..27b1c2ed 100644 --- a/common/modules/base.jsm +++ b/common/modules/base.jsm @@ -65,7 +65,7 @@ if (!Object.defineProperties) Object.defineProperties = function defineProperties(obj, props) { for (let [k, v] in Iterator(props)) Object.defineProperty(obj, k, v); - } + }; if (!Object.freeze) Object.freeze = function freeze(obj) {}; if (!Object.getPropertyDescriptor) diff --git a/common/modules/config.jsm b/common/modules/config.jsm index 229e09bd..758a55d1 100644 --- a/common/modules/config.jsm +++ b/common/modules/config.jsm @@ -249,12 +249,12 @@ var ConfigBase = Class("ConfigBase", { ; for each (let [id, [name, key, uri]] in Iterator(this.sidebars)) { append.XUL::menupopup[0].* += - + ; append.XUL::broadcasterset[0].* += + oncommand="toggleSidebar(this.id || this.observes);" xmlns={XUL}/>; } util.overlayWindow(window, { append: append.elements() }); diff --git a/common/modules/contexts.jsm b/common/modules/contexts.jsm index 57c18197..febafca4 100644 --- a/common/modules/contexts.jsm +++ b/common/modules/contexts.jsm @@ -278,7 +278,7 @@ var Contexts = Module("contexts", { })), matchingGroups: function (uri) Object.create(this.groupsProto, { - groups: { value: this.activeGroups(uri) }, + groups: { value: this.activeGroups(uri) } }), activeGroups: function (uri, doc) { @@ -313,7 +313,7 @@ var Contexts = Module("contexts", { if (description) group.description = description; if (filter) - group.filter = filter + group.filter = filter; group.persist = persist; } @@ -405,7 +405,7 @@ var Contexts = Module("contexts", { var action = function action() { events.feedkeys(action.macro(makeParams(this, arguments)), noremap, silent); - } + }; action.macro = util.compileMacro(rhs, true); break; @@ -496,9 +496,9 @@ var Contexts = Module("contexts", { if (args.has("-locations")) group.filter = filter; if (args.has("-description")) - group.description = args["-description"] + group.description = args["-description"]; if (args.has("-nopersist")) - group.persist = !args["-nopersist"] + group.persist = !args["-nopersist"]; } if (!group.builtin && args.has("-args")) { diff --git a/common/modules/downloads.jsm b/common/modules/downloads.jsm index 8815c522..5e8bcebf 100644 --- a/common/modules/downloads.jsm +++ b/common/modules/downloads.jsm @@ -106,7 +106,7 @@ var Download = Class("Download", { function action() { try { if (this.MIMEInfo && this.MIMEInfo.preferredAction == this.MIMEInfo.useHelperApp) - this.MIMEInfo.launchWithFile(file) + this.MIMEInfo.launchWithFile(file); else file.launch(); } diff --git a/common/modules/finder.jsm b/common/modules/finder.jsm index a2aeb145..131bed44 100644 --- a/common/modules/finder.jsm +++ b/common/modules/finder.jsm @@ -175,7 +175,7 @@ var RangeFinder = Module("rangefinder", { modes.addMode("FIND", { description: "Find mode, active when typing search input", - bases: [modes.COMMAND_LINE], + bases: [modes.COMMAND_LINE] }); modes.addMode("FIND_FORWARD", { description: "Forward Find mode, active when typing search input", @@ -398,7 +398,7 @@ var RangeFind = Class("RangeFind", { var node = util.evaluateXPath(RangeFind.selectNodePath, this.lastRange.commonAncestorContainer).snapshotItem(0); if (node) { - node.focus() + node.focus(); // Re-highlight collapsed selection this.selectedRange = this.lastRange; } diff --git a/common/modules/io.jsm b/common/modules/io.jsm index ac5b07b9..5e1dd0b4 100644 --- a/common/modules/io.jsm +++ b/common/modules/io.jsm @@ -216,7 +216,7 @@ var IO = Module("io", { defineModule.loadLog.push("done sourcing " + filename + ": " + (Date.now() - time) + "ms"); } }, this); - }, + } }), // TODO: there seems to be no way, short of a new component, to change diff --git a/common/modules/javascript.jsm b/common/modules/javascript.jsm index 82f1152b..686d81b2 100644 --- a/common/modules/javascript.jsm +++ b/common/modules/javascript.jsm @@ -41,7 +41,7 @@ var JavaScript = Module("javascript", { this.window = window; init.supercall(this); - }, + } }), globals: Class.memoize(function () [ @@ -806,7 +806,7 @@ var JavaScript = Module("javascript", { get completionList() this.widgets.statusbar.commandline.id, accept: function accept() { - dactyl.trapErrors(function () { this.repl.addOutput(this.command) }, this); + dactyl.trapErrors(function () { this.repl.addOutput(this.command); }, this); this.completions.cleanup(); this.history.save(); diff --git a/common/modules/messages.jsm b/common/modules/messages.jsm index a25cce72..546c1a40 100644 --- a/common/modules/messages.jsm +++ b/common/modules/messages.jsm @@ -110,7 +110,7 @@ var Messages = Module("messages", { if (value != null) { let name = [this.constructor.className.toLowerCase(), this.identifier || this.name, prop].join("."); if (!isObject(value)) - value = messages.get(name, value) + value = messages.get(name, value); else if (isArray(value)) // Deprecated iter(value).forEach(function ([k, v]) { @@ -129,7 +129,7 @@ var Messages = Module("messages", { }, set: function set(val) this[_prop] = val - } + }; } this.default = prop; this.initialized = true; diff --git a/common/modules/options.jsm b/common/modules/options.jsm index 0bc9658c..6f98e157 100644 --- a/common/modules/options.jsm +++ b/common/modules/options.jsm @@ -715,7 +715,7 @@ var Option = Class("Option", { type: type, _op: Option.ops[type] - }) + }); if (type in Option.getKey) class_.prototype.getKey = Option.getKey[type]; diff --git a/common/modules/sanitizer.jsm b/common/modules/sanitizer.jsm index 87b5b38b..1a86c4ed 100644 --- a/common/modules/sanitizer.jsm +++ b/common/modules/sanitizer.jsm @@ -18,7 +18,7 @@ Components.utils.import("resource://dactyl/bootstrap.jsm"); defineModule("sanitizer", { exports: ["Range", "Sanitizer", "sanitizer"], use: ["config"], - require: ["messages", "prefs", "services", "storage", "template", "util"], + require: ["messages", "prefs", "services", "storage", "template", "util"] }, this); let tmp = {}; @@ -434,7 +434,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef if (args["-host"]) { args["-host"].forEach(function (host) { sanitizer.sanitizing = true; - sanitizer.sanitizeItems(items, range, host) + sanitizer.sanitizeItems(items, range, host); }); } else @@ -457,7 +457,7 @@ var Sanitizer = Module("sanitizer", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakRef !args["-host"].some(function (host) util.isSubdomain(item.text, host))); modules.completion.domain(context); }, - type: modules.CommandOption.LIST, + type: modules.CommandOption.LIST }, { names: ["-older", "-o"], description: "Sanitize items older than timespan",