Change phantom.arguments to phantom.args.

This is explained in
http://code.google.com/p/phantomjs/issues/detail?id=16:

'arguments' is reserved word.

Reported by: Nicolas Ferrero.
1.0
Ariya Hidayat 2011-01-14 22:24:47 -08:00
parent 32701e9bba
commit 7f9e03ffad
8 changed files with 24 additions and 24 deletions

View File

@ -1,7 +1,7 @@
if (phantom.arguments.length === 0) {
console.log('Try to pass some arguments when invoking this script!');
if (phantom.args.length === 0) {
console.log('Try to pass some args when invoking this script!');
} else {
phantom.arguments.forEach(function (arg, i) {
phantom.args.forEach(function (arg, i) {
console.log(i + ': ' + arg);
});
}

View File

@ -2,13 +2,13 @@
if (phantom.state.length === 0) {
var origin, dest;
if (phantom.arguments.length < 2) {
if (phantom.args.length < 2) {
console.log('Usage: direction.js origin destination');
console.log('Example: direction.js "San Diego" "Palo Alto"');
phantom.exit(1);
}
origin = phantom.arguments[0];
dest = phantom.arguments[1];
origin = phantom.args[0];
dest = phantom.args[1];
phantom.state = origin + ' to ' + dest;
phantom.open(encodeURI('http://maps.googleapis.com/maps/api/directions/xml?origin=' + origin +
'&destination=' + dest + '&units=imperial&mode=driving&sensor=false'));

View File

@ -1,9 +1,9 @@
if (phantom.state.length === 0) {
if (phantom.arguments.length === 0) {
if (phantom.args.length === 0) {
console.log('Usage: loadspeed.js <some URL>');
phantom.exit();
} else {
var address = phantom.arguments[0];
var address = phantom.args[0];
phantom.state = Date.now().toString();
console.log('Loading ' + address);
phantom.open(address);

View File

@ -1,15 +1,15 @@
if (phantom.state.length === 0) {
if (phantom.arguments.length !== 2) {
if (phantom.args.length !== 2) {
console.log('Usage: rasterize.js URL filename');
phantom.exit();
} else {
var address = phantom.arguments[0];
var address = phantom.args[0];
phantom.state = 'rasterize';
phantom.viewportSize = { width: 600, height: 600 };
phantom.open(address);
}
} else {
var output = phantom.arguments[1];
var output = phantom.args[1];
phantom.sleep(200);
phantom.render(output);
phantom.exit();

View File

@ -1,10 +1,10 @@
if (phantom.state.length === 0) {
if (phantom.arguments.length !== 1) {
if (phantom.args.length !== 1) {
console.log('Usage: run-jasmine.js URL');
phantom.exit();
} else {
phantom.state = 'run-jasmine';
phantom.open(phantom.arguments[0]);
phantom.open(phantom.args[0]);
}
} else {
window.setInterval(function () {

View File

@ -1,5 +1,5 @@
if (phantom.state.length === 0) {
var address = phantom.arguments[0];
var address = phantom.args[0];
phantom.state = 'news';
phantom.viewportSize = { width: 320, height: 480 };
phantom.open('http://news.google.com/news/i/section?&topic=t');

View File

@ -1,7 +1,7 @@
if (phantom.state.length === 0) {
var city = 'Mountain View';
if (phantom.arguments.length > 0) {
city = phantom.arguments.join(' ');
if (phantom.args.length > 0) {
city = phantom.args.join(' ');
}
phantom.state = city;
console.log('Loading ' + city);

View File

@ -93,7 +93,7 @@ QString WebPage::userAgentForUrl(const QUrl &url) const
class Phantom: public QObject
{
Q_OBJECT
Q_PROPERTY(QStringList arguments READ arguments)
Q_PROPERTY(QStringList args READ args)
Q_PROPERTY(QString content READ content WRITE setContent)
Q_PROPERTY(QString loadStatus READ loadStatus)
Q_PROPERTY(QString state READ state WRITE setState)
@ -104,7 +104,7 @@ class Phantom: public QObject
public:
Phantom(QObject *parent = 0);
QStringList arguments() const;
QStringList args() const;
QString content() const;
void setContent(const QString &content);
@ -136,7 +136,7 @@ private slots:
void finish(bool);
private:
QStringList m_arguments;
QStringList m_args;
QString m_loadStatus;
WebPage m_page;
int m_returnValue;
@ -154,9 +154,9 @@ Phantom::Phantom(QObject *parent)
// first argument: program name (phantomjs)
// second argument: script name
m_arguments = QApplication::arguments();
m_arguments.removeFirst();
m_arguments.removeFirst();
m_args = QApplication::arguments();
m_args.removeFirst();
m_args.removeFirst();
connect(m_page.mainFrame(), SIGNAL(javaScriptWindowObjectCleared()), SLOT(inject()));
connect(&m_page, SIGNAL(loadFinished(bool)), this, SLOT(finish(bool)));
@ -174,9 +174,9 @@ Phantom::Phantom(QObject *parent)
m_page.mainFrame()->setScrollBarPolicy(Qt::Vertical, Qt::ScrollBarAlwaysOff);
}
QStringList Phantom::arguments() const
QStringList Phantom::args() const
{
return m_arguments;
return m_args;
}
QString Phantom::content() const