mirror of https://github.com/vitalif/phantomjs
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
parent
7f42c28024
commit
4fd7fb9d40
|
@ -151,7 +151,7 @@ bool Phantom::execute()
|
||||||
|
|
||||||
if (m_config.debug())
|
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;
|
m_returnValue = -1;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
|
@ -98,12 +98,12 @@ bool Utils::injectJsInFrame(const QString &jsFilePath, const Encoding &jsFileEnc
|
||||||
return true;
|
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);
|
QString scriptPath = findScript(jsFilePath, libraryPath);
|
||||||
|
|
Loading…
Reference in New Issue