mirror of https://github.com/vitalif/phantomjs
Simplify WebPage signal sending
parent
ff10a7af4d
commit
9b69c83e2a
|
@ -48,12 +48,12 @@ class CustomPage(QWebPage):
|
||||||
return False
|
return False
|
||||||
|
|
||||||
def javaScriptAlert(self, originatingFrame, msg):
|
def javaScriptAlert(self, originatingFrame, msg):
|
||||||
self.parent.emitAlert(msg)
|
self.parent.javaScriptAlertSent.emit(msg)
|
||||||
|
|
||||||
def javaScriptConsoleMessage(self, message, lineNumber, sourceID):
|
def javaScriptConsoleMessage(self, message, lineNumber, sourceID):
|
||||||
if sourceID:
|
if sourceID:
|
||||||
message = '%s:%d %s' % (sourceID, lineNumber, message)
|
message = '%s:%d %s' % (sourceID, lineNumber, message)
|
||||||
self.parent.emitConsoleMessage(message)
|
self.parent.javaScriptConsoleMessageSent.emit(message)
|
||||||
|
|
||||||
def userAgentForUrl(self, url):
|
def userAgentForUrl(self, url):
|
||||||
return self.m_userAgent
|
return self.m_userAgent
|
||||||
|
@ -62,6 +62,9 @@ class CustomPage(QWebPage):
|
||||||
|
|
||||||
|
|
||||||
class WebPage(QObject):
|
class WebPage(QObject):
|
||||||
|
javaScriptAlertSent = pyqtSignal(str)
|
||||||
|
javaScriptConsoleMessageSent = pyqtSignal(str)
|
||||||
|
|
||||||
def __init__(self, parent=None):
|
def __init__(self, parent=None):
|
||||||
QObject.__init__(self, parent)
|
QObject.__init__(self, parent)
|
||||||
|
|
||||||
|
@ -106,14 +109,6 @@ class WebPage(QObject):
|
||||||
if 'userAgent' in defaults:
|
if 'userAgent' in defaults:
|
||||||
self.m_webPage.m_userAgent = defaults['userAgent']
|
self.m_webPage.m_userAgent = defaults['userAgent']
|
||||||
|
|
||||||
javaScriptAlertSent = pyqtSignal(str)
|
|
||||||
def emitAlert(self, msg):
|
|
||||||
self.javaScriptAlertSent.emit(msg)
|
|
||||||
|
|
||||||
javaScriptConsoleMessageSent = pyqtSignal(str)
|
|
||||||
def emitConsoleMessage(self, msg):
|
|
||||||
self.javaScriptConsoleMessageSent.emit(msg)
|
|
||||||
|
|
||||||
loadStatusChanged = pyqtSignal(str)
|
loadStatusChanged = pyqtSignal(str)
|
||||||
def finish(self, ok):
|
def finish(self, ok):
|
||||||
status = 'success' if ok else 'fail'
|
status = 'success' if ok else 'fail'
|
||||||
|
|
Loading…
Reference in New Issue