vitalif
/
phantomjs
mirror of https://github.com/vitalif/phantomjs
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixing what seems like a "copy & paste went wrong". 

The parameter "startingScript" was never used, and I think it comes from the sibling method "injectJsInFrame".
1.5
Ivan De Marino 2012-01-04 16:56:31 +00:00
parent 7f42c28024
commit 4fd7fb9d40
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/phantom.cpp
View File

@ -151,7 +151,7 @@ bool Phantom::execute()
if (m_config.debug())
{
if (!Utils::loadJSForDebug(m_config.scriptFile(), m_scriptFileEnc, QDir::currentPath(), m_page->mainFrame(), true)) {
if (!Utils::loadJSForDebug(m_config.scriptFile(), m_scriptFileEnc, QDir::currentPath(), m_page->mainFrame())) {
m_returnValue = -1;
return false;
}

6
src/utils.cpp
View File

@ -98,12 +98,12 @@ bool Utils::injectJsInFrame(const QString &jsFilePath, const Encoding &jsFileEnc
return true;
}
bool Utils::loadJSForDebug(const QString& jsFilePath, const QString& libraryPath, QWebFrame* targetFrame, const bool startingScript)
bool Utils::loadJSForDebug(const QString& jsFilePath, const QString& libraryPath, QWebFrame* targetFrame)
{
return loadJSForDebug(jsFilePath, Encoding::UTF8, libraryPath, targetFrame, startingScript);
return loadJSForDebug(jsFilePath, Encoding::UTF8, libraryPath, targetFrame);
}
bool Utils::loadJSForDebug(const QString& jsFilePath, const Encoding& jsFileEnc, const QString& libraryPath, QWebFrame* targetFrame, const bool startingScript)
bool Utils::loadJSForDebug(const QString& jsFilePath, const Encoding& jsFileEnc, const QString& libraryPath, QWebFrame* targetFrame)
{
QString scriptPath = findScript(jsFilePath, libraryPath);