Skip to content

Commit 52ef597

Browse files
committed
Minor style improvements and a few new comments
1 parent dc570de commit 52ef597

File tree

5 files changed

+22
-36
lines changed

5 files changed

+22
-36
lines changed

lib/XMLHttpRequest.js

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,9 @@
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+
, spawn = require("child_process").spawn
16+
, fs = require('fs');
1717

1818
exports.XMLHttpRequest = function() {
1919
/**
@@ -402,7 +402,7 @@ exports.XMLHttpRequest = function() {
402402
fs.writeFileSync(syncFile, "", "utf8");
403403
// The async request the other Node process executes
404404
var execString = "var http = require('http'), https = require('https'), fs = require('fs');"
405-
+ "var doRequest = http" + (ssl?"s":"") + ".request;"
405+
+ "var doRequest = http" + (ssl ? "s" : "") + ".request;"
406406
+ "var options = " + JSON.stringify(options) + ";"
407407
+ "var responseText = '';"
408408
+ "var req = doRequest(options, function(response) {"
@@ -430,7 +430,7 @@ exports.XMLHttpRequest = function() {
430430
syncProc.stdin.end();
431431
// Remove the temporary file
432432
fs.unlinkSync(syncFile);
433-
if(self.responseText.match(/^NODE-XMLHTTPREQUEST-ERROR:/)) {
433+
if (self.responseText.match(/^NODE-XMLHTTPREQUEST-ERROR:/)) {
434434
// If the file returned an error, handle it
435435
var errorObj = self.responseText.replace(/^NODE-XMLHTTPREQUEST-ERROR:/, "");
436436
self.handleError(errorObj);
@@ -443,6 +443,9 @@ exports.XMLHttpRequest = function() {
443443
}
444444
};
445445

446+
/**
447+
* Called when an error is encountered to deal with it.
448+
*/
446449
this.handleError = function(error) {
447450
this.status = 503;
448451
this.statusText = error;

tests/test-constants.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
var sys = require("util")
2-
,assert = require("assert")
3-
,XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4-
,xhr = new XMLHttpRequest();
2+
, assert = require("assert")
3+
, XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4+
, xhr = new XMLHttpRequest();
55

66
// Test constant values
77
assert.equal(0, xhr.UNSENT);

tests/test-exceptions.js

Lines changed: 3 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,7 @@
11
var sys = require("util")
2-
,assert = require("assert")
3-
,XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4-
,xhr = new XMLHttpRequest()
5-
,http = require("http");
6-
7-
// Test server
8-
/*
9-
var server = http.createServer(function (req, res) {
10-
var body = "Hello World";
11-
res.writeHead(200, {
12-
"Content-Type": "text/plain",
13-
"Content-Length": Buffer.byteLength(body),
14-
"Connection": "close"
15-
});
16-
res.write("Hello World");
17-
res.end();
18-
19-
this.close();
20-
}).listen(8000);
21-
*/
2+
, assert = require("assert")
3+
, XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4+
, xhr = new XMLHttpRequest();
225

236
// Test request methods that aren't allowed
247
try {

tests/test-headers.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
var sys = require("util")
2-
,assert = require("assert")
3-
,XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4-
,xhr = new XMLHttpRequest()
5-
,http = require("http");
2+
, assert = require("assert")
3+
, XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4+
, xhr = new XMLHttpRequest()
5+
, http = require("http");
66

77
// Test server
88
var server = http.createServer(function (req, res) {

tests/test-request-methods.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
var sys = require("util")
2-
,assert = require("assert")
3-
,XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4-
,http = require("http")
5-
,xhr;
2+
, assert = require("assert")
3+
, XMLHttpRequest = require("../lib/XMLHttpRequest").XMLHttpRequest
4+
, http = require("http")
5+
, xhr;
66

77
// Test server
88
var server = http.createServer(function (req, res) {

0 commit comments

Comments
 (0)