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

Merge pull request #74 from Roejames12/master 

Script filename as phantom.scriptName
1.2
Ariya Hidayat 2011-06-15 19:10:50 -07:00
parent da34ca2d04 61459fab45
commit 8908fda663
3 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
python/pyphantomjs/phantom.py
View File

@ -130,6 +130,10 @@ class Phantom(QObject):
def scriptLookupDir(self, dirPath):
self.m_page.scriptLookupDir = dirPath
@pyqtProperty(str)
def scriptName(self):
return os.path.basename(self.m_scriptFile)
@pyqtProperty('QVariantMap')
def version(self):
version = {

5
src/phantom.cpp
View File

@ -241,3 +241,8 @@ void Phantom::setScriptLookupDir(const QString &dirPath)
{
m_page->setScriptLookupDir(dirPath);
}
QString Phantom::scriptName() const
{
return QFileInfo(m_scriptFile).fileName();
}

3
src/phantom.h
View File

@ -43,6 +43,7 @@ class Phantom: public QObject
Q_PROPERTY(QStringList args READ args)
Q_PROPERTY(QVariantMap defaultPageSettings READ defaultPageSettings)
Q_PROPERTY(QString scriptLookupDir READ scriptLookupDir WRITE setScriptLookupDir)
Q_PROPERTY(QString scriptName READ scriptName)
Q_PROPERTY(QVariantMap version READ version)
public:
@ -58,6 +59,8 @@ public:
QString scriptLookupDir() const;
void setScriptLookupDir(const QString &dirPath);
QString scriptName() const;
QVariantMap version() const;
public slots: