Skip to content

Commit 1c8dc65

Browse files
committed
Semicolon fixes
Conflicts: src/chrome/content/report-disable.js src/chrome/content/toolbar_button.js
1 parent fa1e28b commit 1c8dc65

File tree

9 files changed

+28
-28
lines changed

9 files changed

+28
-28
lines changed

src/chrome/content/code/ApplicableList.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// were applied, and which ones weren't but might have been, to the contents
33
// of a given page (top level nsIDOMWindow)
44

5-
serial_number = 0
5+
serial_number = 0;
66

77
function ApplicableList(logger, doc, domWin) {
88
this.domWin = domWin;
@@ -24,7 +24,7 @@ function ApplicableList(logger, doc, domWin) {
2424
serial_number += 1;
2525
this.serial = serial_number;
2626
this.log(DBUG,"Alist serial #" + this.serial + " for " + this.home);
27-
};
27+
}
2828

2929
ApplicableList.prototype = {
3030

@@ -106,7 +106,7 @@ ApplicableList.prototype = {
106106
this.prepend_child(enableLabel);
107107

108108
// add the label at the top
109-
var any_rules = false
109+
var any_rules = false;
110110
for(var x in this.all) {
111111
any_rules = true; // how did JavaScript get this ugly?
112112
break;

src/chrome/content/code/ChannelReplacement.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CtxCapturingListener.prototype = {
1414
onDataAvailable: function(request, ctx, inputStream, offset, count) {},
1515
onStopRequest: function(request, ctx, statusCode) {},
1616
QueryInterface: xpcom_generateQI([Ci.nsIStreamListener])
17-
}
17+
};
1818

1919
function ChannelReplacement(chan, newURI, newMethod) {
2020
return this._init(chan, newURI, newMethod);
@@ -241,9 +241,9 @@ ChannelReplacement.prototype = {
241241
} else {
242242
// legacy (Gecko < 2)
243243
self.observeCapture = function(req, ccl) {
244-
self.open = function() { self._redirect(ccl) }
244+
self.open = function() { self._redirect(ccl); };
245245
callback(self);
246-
}
246+
};
247247
oldChan.cancel(NS_BINDING_REDIRECTED);
248248
}
249249

src/chrome/content/code/Cookie.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ Cookie.prototype = {
8585
v = true;
8686
break;
8787
default:
88-
n = 'unknown'
88+
n = 'unknown';
8989
}
9090
this[n] = v;
9191
}
@@ -145,4 +145,4 @@ Cookie.prototype = {
145145
status: 0,
146146
QueryInterface: xpcom_generateQI([Ci.nsICookie, Ci.nsICookie2])
147147

148-
}
148+
};

src/chrome/content/code/HTTPS.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ const HTTPS = {
243243
var cookieManager = Components.classes["@mozilla.org/cookiemanager;1"]
244244
.getService(Components.interfaces.nsICookieManager2);
245245
//some braindead cookies apparently use umghzabilliontrabilions
246-
var expiry = Math.min(c.expiry, Math.pow(2,31))
246+
var expiry = Math.min(c.expiry, Math.pow(2,31));
247247
cookieManager.remove(c.host, c.name, c.path, false);
248248
cookieManager.add(c.host, c.path, c.name, c.value, true, c.isHTTPOnly, c.isSession, expiry);
249249
}
@@ -307,7 +307,7 @@ const HTTPS = {
307307

308308
} else {
309309
this.log(WARN,"Detected unsafe navigation with NoScript-secured cookies: " + origin + " -> " + uri.spec);
310-
this.log(WARN,uri.prePath + " cannot support secure cookies because it does not use HTTPS. Consider forcing HTTPS for " + uri.host + " in NoScript's Advanced HTTPS options panel.")
310+
this.log(WARN,uri.prePath + " cannot support secure cookies because it does not use HTTPS. Consider forcing HTTPS for " + uri.host + " in NoScript's Advanced HTTPS options panel.");
311311
}
312312

313313
var cs = CC['@mozilla.org/cookieService;1'].getService(CI.nsICookieService).getCookieString(uri, req);
@@ -320,12 +320,12 @@ const HTTPS = {
320320

321321
if (cs) {
322322
dcookies.push.apply(
323-
dcookies, cs.split(/\s*;\s*/).map(function(cs) { var nv = cs.split("="); return { name: nv.shift(), value: nv.join("=") } })
324-
.filter(function(c) { return dcookies.every(function(x) { return x.name != c.name }) })
323+
dcookies, cs.split(/\s*;\s*/).map(function(cs) { var nv = cs.split("="); return { name: nv.shift(), value: nv.join("=") }; })
324+
.filter(function(c) { return dcookies.every(function(x) { return x.name != c.name; }); })
325325
);
326326
}
327327

328-
cs = dcookies.map(function(c) { return c.name + "=" + c.value }).join("; ");
328+
cs = dcookies.map(function(c) { return c.name + "=" + c.value; }).join("; ");
329329

330330
this.log(WARN,"Sending Cookie for " + dhost + ": " + cs);
331331
req.setRequestHeader("Cookie", cs, false); // "false" because merge syntax breaks Cookie header

src/chrome/content/code/IOUtil.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ function nsISupportsWrapper(wrapped) {
5858
}
5959
nsISupportsWrapper.prototype = {
6060
QueryInterface: xpcom_generateQI([])
61-
}
61+
};
6262

6363
const IOUtil = {
6464
asyncNetworking: true,
@@ -241,7 +241,7 @@ const IOUtil = {
241241
if (!this._qsRx.test(qs)) return '';
242242

243243
var cookieNames, hasCookies;
244-
if ((hasCookies = !!cookie)) cookieNames = cookie.split(/\s*;\s*/).map(this._splitName)
244+
if ((hasCookies = !!cookie)) cookieNames = cookie.split(/\s*;\s*/).map(this._splitName);
245245

246246
let parms = qs.split("&");
247247
for (j = parms.length; j-- > 0;) {

src/chrome/content/code/Thread.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ var Thread = {
1717

1818
_spinInternal: function(ctrl) {
1919
var t = ctrl.startTime;
20-
var maxTime = parseInt(ctrl.maxTime)
20+
var maxTime = parseInt(ctrl.maxTime);
2121
if (maxTime) {
2222
while(ctrl.running && this.hostRunning) {
2323
this.yield();

src/chrome/content/preferences.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -259,7 +259,7 @@ function https_prefs_accept() {
259259
.QueryInterface(Components.interfaces.nsIInterfaceRequestor)
260260
.getInterface(Components.interfaces.nsIDOMWindow);
261261

262-
if (outer) outer.close()
262+
if (outer) outer.close();
263263
else alert("no outer space");
264264

265265
return true; // https://developer.mozilla.org/en/XUL/dialog#a-ondialogaccept

src/components/https-everywhere.js

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ const INCLUDE = function(name) {
6262
+ name + ".js");
6363
_INCLUDED[name] = true;
6464
}
65-
}
65+
};
6666

6767
const WP_STATE_START = CI.nsIWebProgressListener.STATE_START;
6868
const WP_STATE_STOP = CI.nsIWebProgressListener.STATE_STOP;
@@ -104,7 +104,7 @@ const N_COHORTS = 1000;
104104

105105
const DUMMY_OBJ = {};
106106
DUMMY_OBJ.wrappedJSObject = DUMMY_OBJ;
107-
const DUMMY_FUNC = function() {}
107+
const DUMMY_FUNC = function() {};
108108
const DUMMY_ARRAY = [];
109109

110110
const EARLY_VERSION_CHECK = !("nsISessionStore" in CI && typeof(/ /) === "object");
@@ -151,17 +151,17 @@ StorageController.prototype = {
151151
[ Components.interfaces.nsISupports,
152152
Components.interfaces.nsIController ]),
153153
wrappedJSObject: null, // Initialized by constructor
154-
supportsCommand: function (cmd) {return (cmd == this.command)},
155-
isCommandEnabled: function (cmd) {return (cmd == this.command)},
156-
onEvent: function(eventName) {return true},
157-
doCommand: function() {return true}
154+
supportsCommand: function (cmd) {return (cmd == this.command);},
155+
isCommandEnabled: function (cmd) {return (cmd == this.command);},
156+
onEvent: function(eventName) {return true;},
157+
doCommand: function() {return true;}
158158
};
159159

160160
function StorageController(command) {
161161
this.command = command;
162162
this.data = {};
163163
this.wrappedJSObject = this;
164-
};
164+
}
165165

166166
/*var Controller = Class("Controller", XPCOM(CI.nsIController), {
167167
init: function (command, data) {
@@ -388,7 +388,7 @@ HTTPSEverywhere.prototype = {
388388
return null;
389389
}
390390
domWin = domWin.top;
391-
return domWin
391+
return domWin;
392392
},
393393

394394
// the lists get made when the urlbar is loading something new, but they
@@ -439,7 +439,7 @@ HTTPSEverywhere.prototype = {
439439
var lst = this.getApplicableListForChannel(channel); // null if no window is associated (ex: xhr)
440440
if (channel.URI.spec in https_everywhere_blacklist) {
441441
this.log(DBUG, "Avoiding blacklisted " + channel.URI.spec);
442-
if (lst) lst.breaking_rule(https_everywhere_blacklist[channel.URI.spec])
442+
if (lst) lst.breaking_rule(https_everywhere_blacklist[channel.URI.spec]);
443443
else this.log(WARN,"Failed to indicate breakage in content menu");
444444
return;
445445
}

src/components/ssl-observatory.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ MAX_DELAYED = 32; // Max # XHRs are waiting around to be sent or retried
1919
TIMEOUT = 60000;
2020

2121
ASN_PRIVATE = -1; // Do not record the ASN this cert was seen on
22-
ASN_IMPLICIT = -2 // ASN can be learned from connecting IP
22+
ASN_IMPLICIT = -2; // ASN can be learned from connecting IP
2323
ASN_UNKNOWABLE = -3; // Cert was seen in the absence of [trustworthy] Internet access
2424

2525
// XXX: We should make the _observatory tree relative.
@@ -51,7 +51,7 @@ const INCLUDE = function(name) {
5151
dump("INCLUDE " + name + ": " + e + "\n");
5252
}
5353
}
54-
}
54+
};
5555

5656
INCLUDE('Root-CAs');
5757
INCLUDE('sha256');

0 commit comments

Comments
 (0)