1
1
mirror of https://github.com/ariya/phantomjs.git synced 2024-08-15 15:50:34 +03:00

Fix whitespace errors introduced in recent commits

This commit is contained in:
Zack Weinberg 2016-01-19 10:24:19 -05:00
parent 2ff3c5ae4a
commit bced581501
26 changed files with 2234 additions and 2248 deletions

View File

@ -15,7 +15,7 @@ before_script:
- chmod +x ./build.py
- chmod +x ./test/run-tests.py
- chmod +x ./test/run-tests-ghostdriver.sh
script:
- ./build.py --confirm --silent #< Build
- ./test/run-tests.py #< Test (PhantomJS)

View File

@ -85,4 +85,3 @@ Here is a check list for the review:
* There is a reasonable amount of comment
* The license header is intact
* All examples are still working

View File

@ -40,5 +40,3 @@ and many others [related projects](http://phantomjs.org/related-projects.html).
PhantomJS is free software/open source, and is distributed under the [BSD license](http://opensource.org/licenses/BSD-3-Clause). It contains third-party code, see the included `third-party.txt` file for the license information on third-party code.
PhantomJS is created and maintained by [Ariya Hidayat](http://ariya.ofilabs.com/about) (Twitter: [@ariyahidayat](http://twitter.com/ariyahidayat)), with the help of [many contributors](https://github.com/ariya/phantomjs/contributors). Follow the official Twitter stream [@PhantomJS](http://twitter.com/PhantomJS) to get the frequent development updates.

View File

@ -206,8 +206,7 @@ printelftypes(void)
for (elfwalk = 0;
elfwalk < sizeof(elftypes)/sizeof(elftypes[0]);
elfwalk++)
fprintf(stderr, "%s(%u) ", elftypes[elfwalk].str,
fprintf(stderr, "%s(%u) ", elftypes[elfwalk].str,
elftypes[elfwalk].value);
fprintf(stderr, "\n");
}

View File

@ -60,4 +60,3 @@ cp bin/phantomjs $SOURCE_PATH
echo
echo "Finished."

View File

@ -13,7 +13,7 @@ if (system.args.length < 3) {
for ( i= 2; i < system.args.length; ++i ) {
content += system.args[i] + (i === system.args.length-1 ? '' : ' ');
}
try {
fs.write(system.args[1], content, 'w');
} catch(e) {

View File

@ -28,4 +28,3 @@ unsupported.forEach(function (e) {
console.log(' ' + e);
});
phantom.exit();

View File

@ -8,11 +8,11 @@ if ( typeof(phantom) !== "undefined" ) {
page.onConsoleMessage = function(msg) {
console.log(msg);
};
page.onAlert = function(msg) {
console.log(msg);
};
console.log("* Script running in the Phantom context.");
console.log("* Script will 'inject' itself in a page...");
page.open("about:blank", function(status) {

View File

@ -13,7 +13,7 @@ if (system.args.length < 4) {
phantom.setProxy(host, port, 'manual', '', '');
page.open(address, function (status) {
if (status !== 'success') {
console.log('FAIL to load the address "' +
console.log('FAIL to load the address "' +
address + '" using proxy "' + host + ':' + port + '"');
} else {
console.log('Page title is ' + page.evaluate(function () {

View File

@ -19,4 +19,3 @@ page.open("http://phantomjs.org/", function(status) {
phantom.exit(1);
}
});

View File

@ -8,4 +8,3 @@ exports.answer = 42;
exports.start = function () {
console.log('Starting the universe....');
}

View File

@ -53,7 +53,6 @@ page.open("http://twitter.com/#!/sencha", function (status) {
}, function() {
console.log("The sign-in dialog should be visible now.");
phantom.exit();
});
});
}
});

View File

@ -71,4 +71,3 @@ p.open("../test/webpage-spec-frames/index.html", function(status) {
phantom.exit();
});

View File

@ -921,4 +921,3 @@ void Config::setSslClientKeyPassphrase(const QByteArray& sslClientKeyPassphrase)
{
m_sslClientKeyPassphrase = sslClientKeyPassphrase;
}

View File

@ -18,7 +18,7 @@ So what usually happens is either:
* Large programs with configure scripts disabling line editing if readline is not present in the system, or not supporting it at all since readline is GPL licensed and libedit (the BSD clone) is not as known and available as readline is (Real world example of this problem: Tclsh).
* Smaller programs not using a configure script not supporting line editing at all (A problem we had with Redis-cli for instance).
The result is a pollution of binaries without line editing support.
So I spent more or less two hours doing a reality check resulting in this little library: is it *really* needed for a line editing library to be 20k lines of code? Apparently not, it is possibe to get a very small, zero configuration, trivial to embed library, that solves the problem. Smaller programs will just include this, supporting line editing out of the box. Larger programs may use this little library or just checking with configure if readline/libedit is available and resorting to linenoise if not.

View File

@ -541,7 +541,7 @@ static int outputChars(struct current *current, const char *buf, int len)
{
COORD pos = { current->x, current->y };
DWORD n;
WriteConsoleOutputCharacterA(current->outh, buf, len, pos, &n);
current->x += len;
return 0;
@ -1210,7 +1210,7 @@ process_char:
refreshLine(current->prompt, current);
break;
default:
if (characterCallback[(int)c]) {
if (characterCallback[(int)c]) {
int rcode;
rcode = characterCallback[(int)c](current->buf,current->len,c);

View File

@ -21,14 +21,14 @@
/**
* Converts the given unicode codepoint (0 - 0xffff) to utf-8
* and stores the result at 'p'.
*
*
* Returns the number of utf-8 characters (1-3).
*/
int utf8_fromunicode(char *p, unsigned short uc);
/**
* Returns the length of the utf-8 sequence starting with 'c'.
*
*
* Returns 1-4, or -1 if this is not a valid start byte.
*
* Note that charlen=4 is not supported by the rest of the API.
@ -36,7 +36,7 @@ int utf8_fromunicode(char *p, unsigned short uc);
int utf8_charlen(int c);
/**
* Returns the number of characters in the utf-8
* Returns the number of characters in the utf-8
* string of the given byte length.
*
* Any bytes which are not part of an valid utf-8
@ -50,7 +50,7 @@ int utf8_strlen(const char *str, int bytelen);
/**
* Returns the byte index of the given character in the utf-8 string.
*
*
* The string *must* be null terminated.
*
* This will return the byte length of a utf-8 string
@ -61,7 +61,7 @@ int utf8_index(const char *str, int charindex);
/**
* Returns the unicode codepoint corresponding to the
* utf-8 sequence 'str'.
*
*
* Stores the result in *uc and returns the number of bytes
* consumed.
*

View File

@ -1,6 +1,6 @@
This project contains version 3.1 of the Mongoose web server project, as
found at http://code.google.com/p/mongoose.
It contains the code for version 3.1 as of 26-May-2011 (revision 0ca751520abf).
It contains an additional change in pthread_cond_broadcast() [~line 865] to
improve stability when running a debug build.
This project contains version 3.1 of the Mongoose web server project, as
found at http://code.google.com/p/mongoose.
It contains the code for version 3.1 as of 26-May-2011 (revision 0ca751520abf).
It contains an additional change in pthread_cond_broadcast() [~line 865] to
improve stability when running a debug build.

View File

@ -3749,7 +3749,7 @@ static void handle_proxy_request(struct mg_connection *conn) {
}
conn->peer->client.is_ssl = is_ssl;
}
// Forward client's request to the target
mg_printf(conn->peer, "%s %s HTTP/%s\r\n", ri->request_method, ri->uri + len,
ri->http_version);

File diff suppressed because it is too large Load Diff

View File

@ -1 +1 @@
ICON 1 "phantomjs_os2.ico"
ICON 1 "phantomjs_os2.ico"

View File

@ -12,7 +12,7 @@ BEGIN
BLOCK "040904E4"
BEGIN
VALUE "FileDescription", "PhantomJS is a headless WebKit with JavaScript API"
VALUE "FileVersion", PHANTOMJS_VERSION_STRING
VALUE "FileVersion", PHANTOMJS_VERSION_STRING
VALUE "LegalCopyright", "Copyright (C) Ariya Hidayat 2012"
VALUE "OriginalFilename", "phantomjs.exe"
VALUE "ProductName", "PhantomJS"

View File

@ -532,4 +532,3 @@ QCommandLine::showVersion(bool quit, int returnCode)
exit(returnCode);
}
}

View File

@ -107,4 +107,3 @@ async_test(function () {
setTimeout(function () { ErrorHelper.foo(); }, 0);
});
}, "stack trace accuracy (webpage script)");

File diff suppressed because it is too large Load Diff

View File

@ -83,4 +83,3 @@ def handle_request(req):
'<p>URL not found: {}</p>'
.format(html_esc(req.path)),
code=404)