Skip to content
This repository has been archived by the owner on May 30, 2023. It is now read-only.

Commit

Permalink
Pass source and lineNumber for console redirection.
Browse files Browse the repository at this point in the history
onConsoleMessage callback can handle two (optional) arguments, e.g.

    page.onConsoleMessage = function (msg, lineNo, source) {
        ....
    };
  • Loading branch information
IceArmy committed Jun 20, 2011
1 parent 1be23d0 commit d29c673
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
6 changes: 4 additions & 2 deletions python/pyphantomjs/phantom.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,10 @@ def execute(self):
injectJsInFrame(self.m_scriptFile, os.path.dirname(os.path.abspath(__file__)), self.m_page.mainFrame(), True)
return not self.m_terminated

def printConsoleMessage(self, msg):
print msg
def printConsoleMessage(self, message, lineNumber, source):
if source:
message = '%s:%d %s' % (source, lineNumber, message)
print message

def returnValue(self):
return self.m_returnValue
Expand Down
6 changes: 2 additions & 4 deletions python/pyphantomjs/webpage.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,7 @@ def javaScriptAlert(self, originatingFrame, msg):
self.parent.javaScriptAlertSent.emit(msg)

def javaScriptConsoleMessage(self, message, lineNumber, sourceID):
if sourceID:
message = '%s:%d %s' % (sourceID, lineNumber, message)
self.parent.javaScriptConsoleMessageSent.emit(message)
self.parent.javaScriptConsoleMessageSent.emit(message, lineNumber, sourceID)

def userAgentForUrl(self, url):
return self.m_userAgent
Expand All @@ -70,7 +68,7 @@ def userAgentForUrl(self, url):

class WebPage(QObject):
javaScriptAlertSent = pyqtSignal(str)
javaScriptConsoleMessageSent = pyqtSignal(str)
javaScriptConsoleMessageSent = pyqtSignal(str, int, str)
loadStarted = pyqtSignal()
loadFinished = pyqtSignal(str)
resourceReceived = pyqtSignal('QVariantMap')
Expand Down

0 comments on commit d29c673

Please sign in to comment.