Skip to content

Commit 86c18b7

Browse files
committed
Clean up and standardize styles. Remove hanging commas, use double quotes
1 parent 2462c9b commit 86c18b7

File tree

3 files changed

+58
-56
lines changed

3 files changed

+58
-56
lines changed

example/demo.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ var xhr = new XMLHttpRequest();
66
xhr.onreadystatechange = function() {
77
sys.puts("State: " + this.readyState);
88

9-
if (this.readyState == 4) {
9+
if (this.readyState === 4) {
1010
sys.puts("Complete.\nBody length: " + this.responseText.length);
1111
sys.puts("Body:\n" + this.responseText);
1212
}

lib/XMLHttpRequest.js

Lines changed: 33 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -11,17 +11,19 @@
1111
* @license MIT
1212
*/
1313

14-
var Url = require("url")
15-
, spawn = require("child_process").spawn
16-
, fs = require('fs');
14+
var Url = require("url");
15+
var spawn = require("child_process").spawn;
16+
var fs = require("fs");
1717

1818
exports.XMLHttpRequest = function() {
19+
"use strict";
20+
1921
/**
2022
* Private variables
2123
*/
2224
var self = this;
23-
var http = require('http');
24-
var https = require('https');
25+
var http = require("http");
26+
var https = require("https");
2527

2628
// Holds http.js objects
2729
var request;
@@ -183,11 +185,11 @@ exports.XMLHttpRequest = function() {
183185
* @param string value Header value
184186
*/
185187
this.setRequestHeader = function(header, value) {
186-
if (this.readyState != this.OPENED) {
188+
if (this.readyState !== this.OPENED) {
187189
throw "INVALID_STATE_ERR: setRequestHeader can only be called when state is OPEN";
188190
}
189191
if (!isAllowedHttpHeader(header)) {
190-
console.warn('Refused to set unsafe header "' + header + '"');
192+
console.warn("Refused to set unsafe header \"" + header + "\"");
191193
return;
192194
}
193195
if (sendFlag) {
@@ -255,7 +257,7 @@ exports.XMLHttpRequest = function() {
255257
* @param string data Optional data to send as request body.
256258
*/
257259
this.send = function(data) {
258-
if (this.readyState != this.OPENED) {
260+
if (this.readyState !== this.OPENED) {
259261
throw "INVALID_STATE_ERR: connection must be opened before send() is called";
260262
}
261263

@@ -268,19 +270,19 @@ exports.XMLHttpRequest = function() {
268270
var host;
269271
// Determine the server
270272
switch (url.protocol) {
271-
case 'https:':
273+
case "https:":
272274
ssl = true;
273275
// SSL & non-SSL both need host, no break here.
274-
case 'http:':
276+
case "http:":
275277
host = url.hostname;
276278
break;
277279

278-
case 'file:':
280+
case "file:":
279281
local = true;
280282
break;
281283

282284
case undefined:
283-
case '':
285+
case "":
284286
host = "localhost";
285287
break;
286288

@@ -295,7 +297,7 @@ exports.XMLHttpRequest = function() {
295297
}
296298

297299
if (settings.async) {
298-
fs.readFile(url.pathname, 'utf8', function(error, data) {
300+
fs.readFile(url.pathname, "utf8", function(error, data) {
299301
if (error) {
300302
self.handleError(error);
301303
} else {
@@ -306,7 +308,7 @@ exports.XMLHttpRequest = function() {
306308
});
307309
} else {
308310
try {
309-
this.responseText = fs.readFileSync(url.pathname, 'utf8');
311+
this.responseText = fs.readFileSync(url.pathname, "utf8");
310312
this.status = 200;
311313
setState(self.DONE);
312314
} catch(e) {
@@ -321,21 +323,21 @@ exports.XMLHttpRequest = function() {
321323
// to use http://localhost:port/path
322324
var port = url.port || (ssl ? 443 : 80);
323325
// Add query string if one is used
324-
var uri = url.pathname + (url.search ? url.search : '');
326+
var uri = url.pathname + (url.search ? url.search : "");
325327

326328
// Set the Host header or the server may reject the request
327-
headers["Host"] = host;
329+
headers.Host = host;
328330
if (!((ssl && port === 443) || port === 80)) {
329-
headers["Host"] += ':' + url.port;
331+
headers.Host += ":" + url.port;
330332
}
331333

332334
// Set Basic Auth if necessary
333335
if (settings.user) {
334-
if (typeof settings.password == "undefined") {
336+
if (typeof settings.password === "undefined") {
335337
settings.password = "";
336338
}
337339
var authBuf = new Buffer(settings.user + ":" + settings.password);
338-
headers["Authorization"] = "Basic " + authBuf.toString("base64");
340+
headers.Authorization = "Basic " + authBuf.toString("base64");
339341
}
340342

341343
// Set content length header
@@ -377,7 +379,7 @@ exports.XMLHttpRequest = function() {
377379
self.dispatchEvent("readystatechange");
378380

379381
// Handler for the response
380-
function responseHandler(resp) {
382+
var responseHandler = function responseHandler(resp) {
381383
// Set response var to the response we got back
382384
// This is so it remains accessable outside this scope
383385
response = resp;
@@ -394,12 +396,12 @@ exports.XMLHttpRequest = function() {
394396
hostname: url.hostname,
395397
port: url.port,
396398
path: url.path,
397-
method: response.statusCode === 303 ? 'GET' : settings.method,
399+
method: response.statusCode === 303 ? "GET" : settings.method,
398400
headers: headers
399401
};
400402

401403
// Issue the new request
402-
request = doRequest(newOptions, responseHandler).on('error', errorHandler);
404+
request = doRequest(newOptions, responseHandler).on("error", errorHandler);
403405
request.end();
404406
// @TODO Check if an XHR event needs to be fired here
405407
return;
@@ -410,7 +412,7 @@ exports.XMLHttpRequest = function() {
410412
setState(self.HEADERS_RECEIVED);
411413
self.status = response.statusCode;
412414

413-
response.on('data', function(chunk) {
415+
response.on("data", function(chunk) {
414416
// Make sure there's some data
415417
if (chunk) {
416418
self.responseText += chunk;
@@ -421,26 +423,26 @@ exports.XMLHttpRequest = function() {
421423
}
422424
});
423425

424-
response.on('end', function() {
426+
response.on("end", function() {
425427
if (sendFlag) {
426-
// Discard the 'end' event if the connection has been aborted
428+
// Discard the end event if the connection has been aborted
427429
setState(self.DONE);
428430
sendFlag = false;
429431
}
430432
});
431433

432-
response.on('error', function(error) {
434+
response.on("error", function(error) {
433435
self.handleError(error);
434436
});
435-
}
437+
};
436438

437439
// Error handler for the request
438-
function errorHandler(error) {
440+
var errorHandler = function errorHandler(error) {
439441
self.handleError(error);
440-
}
442+
};
441443

442444
// Create the request
443-
request = doRequest(options, responseHandler).on('error', errorHandler);
445+
request = doRequest(options, responseHandler).on("error", errorHandler);
444446

445447
// Node 0.4 and later won't accept empty data. Make sure it's needed.
446448
if (data) {
@@ -485,7 +487,7 @@ exports.XMLHttpRequest = function() {
485487
while(fs.existsSync(syncFile)) {
486488
// Wait while the sync file is empty
487489
}
488-
self.responseText = fs.readFileSync(contentFile, 'utf8');
490+
self.responseText = fs.readFileSync(contentFile, "utf8");
489491
// Kill the child process once the file has data
490492
syncProc.stdin.end();
491493
// Remove the temporary file

package.json

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,27 @@
11
{
2-
"name": "xmlhttprequest"
3-
, "description": "XMLHttpRequest for Node"
4-
, "version": "1.6.0"
5-
, "author": {
6-
"name": "Dan DeFelippi"
7-
, "url": "http://driverdan.com"
8-
}
9-
, "keywords": ["xhr", "ajax"]
10-
, "licenses": [{
11-
"type": "MIT"
12-
, "url": "http://creativecommons.org/licenses/MIT/"
13-
}]
14-
, "repository": {
15-
"type": "git"
16-
, "url": "git://github.com/driverdan/node-XMLHttpRequest.git"
17-
}
18-
, "bugs": "http://github.com/driverdan/node-XMLHttpRequest/issues"
19-
, "engines": {
2+
"name": "xmlhttprequest",
3+
"description": "XMLHttpRequest for Node",
4+
"version": "1.6.0",
5+
"author": {
6+
"name": "Dan DeFelippi",
7+
"url": "http://driverdan.com"
8+
},
9+
"keywords": ["xhr", "ajax"],
10+
"licenses": [{
11+
"type": "MIT",
12+
"url": "http://creativecommons.org/licenses/MIT/"
13+
}],
14+
"repository": {
15+
"type": "git",
16+
"url": "git://github.com/driverdan/node-XMLHttpRequest.git"
17+
},
18+
"bugs": "http://github.com/driverdan/node-XMLHttpRequest/issues",
19+
"engines": {
2020
"node": ">=0.4.0"
21-
}
22-
, "directories": {
23-
"lib": "./lib"
24-
, "example": "./example"
25-
}
26-
, "main": "./lib/XMLHttpRequest.js"
21+
},
22+
"directories": {
23+
"lib": "./lib",
24+
"example": "./example"
25+
},
26+
"main": "./lib/XMLHttpRequest.js"
2727
}

0 commit comments

Comments
 (0)