diff options
author | Andras Becsi <andras.becsi@digia.com> | 2014-08-06 14:58:33 +0200 |
---|---|---|
committer | Andras Becsi <andras.becsi@digia.com> | 2014-08-06 17:49:30 +0200 |
commit | 83a6c1b92f38b4b0bdb3f90d67be7bb1e4caef7a (patch) | |
tree | 030b00c0810eae31e6506202c1a3d687928c779f /src/webengine | |
parent | 8d914a161db9a4760594267285c48521b3af5481 (diff) |
Move the runJavaScript function from experimental to public API
This is essential API that should be public.
Change-Id: Ifbd86171933936112e2495ebed074faa2e52464d
Reviewed-by: Jocelyn Turcotte <jocelyn.turcotte@digia.com>
Diffstat (limited to 'src/webengine')
-rw-r--r-- | src/webengine/api/qquickwebengineview.cpp | 19 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview_p.h | 1 | ||||
-rw-r--r-- | src/webengine/api/qquickwebengineview_p_p.h | 1 | ||||
-rw-r--r-- | src/webengine/doc/src/qquickwebengineview_lgpl.qdoc | 14 |
4 files changed, 25 insertions, 10 deletions
diff --git a/src/webengine/api/qquickwebengineview.cpp b/src/webengine/api/qquickwebengineview.cpp index f4881e8a5..2678832a7 100644 --- a/src/webengine/api/qquickwebengineview.cpp +++ b/src/webengine/api/qquickwebengineview.cpp @@ -584,6 +584,16 @@ bool QQuickWebEngineView::canGoForward() const return d->adapter->canGoForward(); } +void QQuickWebEngineView::runJavaScript(const QString &script, const QJSValue &callback) +{ + Q_D(QQuickWebEngineView); + if (!callback.isUndefined()) { + quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script); + d->m_callbacks.insert(requestId, callback); + } else + d->adapter->runJavaScript(script); +} + QQuickWebEngineViewExperimental *QQuickWebEngineView::experimental() const { Q_D(const QQuickWebEngineView); @@ -627,15 +637,6 @@ QQmlComponent *QQuickWebEngineViewExperimental::extraContextMenuEntriesComponent return d_ptr->contextMenuExtraItems; } -void QQuickWebEngineViewExperimental::runJavaScript(const QString &script, const QJSValue &callback) -{ - if (!callback.isUndefined()) { - quint64 requestId = d_ptr->adapter->runJavaScriptCallbackResult(script); - d_ptr->m_callbacks.insert(requestId, callback); - } else - d_ptr->adapter->runJavaScript(script); -} - QQuickWebEngineHistory *QQuickWebEngineViewExperimental::navigationHistory() const { return d_ptr->m_history.data(); diff --git a/src/webengine/api/qquickwebengineview_p.h b/src/webengine/api/qquickwebengineview_p.h index 59349954f..c74ae82fc 100644 --- a/src/webengine/api/qquickwebengineview_p.h +++ b/src/webengine/api/qquickwebengineview_p.h @@ -132,6 +132,7 @@ public: }; public Q_SLOTS: + void runJavaScript(const QString&, const QJSValue & = QJSValue()); void loadHtml(const QString &html, const QUrl &baseUrl = QUrl()); void goBack(); void goForward(); diff --git a/src/webengine/api/qquickwebengineview_p_p.h b/src/webengine/api/qquickwebengineview_p_p.h index 89d67bcd8..280133856 100644 --- a/src/webengine/api/qquickwebengineview_p_p.h +++ b/src/webengine/api/qquickwebengineview_p_p.h @@ -107,7 +107,6 @@ public: public Q_SLOTS: void goBackTo(int index); void goForwardTo(int index); - void runJavaScript(const QString&, const QJSValue & = QJSValue()); void grantFeaturePermission(const QUrl &securityOrigin, Feature, bool granted); Q_SIGNALS: diff --git a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc index 2f6ba7f0e..ac88729fc 100644 --- a/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc +++ b/src/webengine/doc/src/qquickwebengineview_lgpl.qdoc @@ -181,6 +181,20 @@ \sa WebEngineView::url */ + +/*! + \qmlmethod void WebEngineView::runJavaScript(string script, variant callback) + \brief Runs the specified \a script in the content of the web view. + + In case a callback function is provided it will be invoked after the script + finished running. + + \code + runJavaScript("document.title", function(result) { console.log(result); }); + \endcode + +*/ + /*! \qmlsignal WebEngineView::onLoadingChanged(loadRequest) |