From 69ff230f3a14d63fc79dddfc7adbdb4c3c53727e Mon Sep 17 00:00:00 2001 From: IceArmy Date: Wed, 1 Jun 2011 12:14:20 -0700 Subject: [PATCH] Revert "Fix bug where WebPage.evaluate had a syntax error." This reverts commit d2c520a77773303fcfcabda613a11d4f49ffaf1c. --- python/webpage.py | 2 +- src/webpage.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/python/webpage.py b/python/webpage.py index 484e74a3..a197cd02 100644 --- a/python/webpage.py +++ b/python/webpage.py @@ -269,7 +269,7 @@ class WebPage(QObject): @pyqtSlot(str, result='QVariant') def evaluate(self, code): - function = '(function(){%s}).call(this);' % code + function = '(%s)()' % code return self.m_mainFrame.evaluateJavaScript(function) @pyqtSlot(str, str, 'QVariantMap') diff --git a/src/webpage.cpp b/src/webpage.cpp index 499425ad..aa0da7fe 100644 --- a/src/webpage.cpp +++ b/src/webpage.cpp @@ -209,7 +209,7 @@ QVariantMap WebPage::paperSize() const QVariant WebPage::evaluate(const QString &code) { - QString function = "(function(){" + code + "}).call(this);"; + QString function = "(" + code + ")()"; return m_mainFrame->evaluateJavaScript(function); }