diff --git a/src/context/applets/wikipedia/package/contents/ui/main.qml b/src/context/applets/wikipedia/package/contents/ui/main.qml --- a/src/context/applets/wikipedia/package/contents/ui/main.qml +++ b/src/context/applets/wikipedia/package/contents/ui/main.qml @@ -53,7 +53,7 @@ Layout.alignment: Qt.AlignLeft tooltip: i18n("Refresh") - onClicked: content.reload() + onClicked: WikipediaEngine.reloadWikipedia() } Item { Layout.fillWidth: true @@ -98,8 +98,10 @@ Layout.alignment: Qt.AlignBottom onNavigationRequested: { - request.action = WebEngineNavigationRequest.IgnoreRequest; - WikipediaEngine.url = request.url; + if (request.navigationType == WebEngineNavigationRequest.LinkClickedNavigation) { + request.action = WebEngineNavigationRequest.IgnoreRequest + WikipediaEngine.url = request.url + } } Connections { diff --git a/src/context/applets/wikipedia/plugin/WikipediaEngine.h b/src/context/applets/wikipedia/plugin/WikipediaEngine.h --- a/src/context/applets/wikipedia/plugin/WikipediaEngine.h +++ b/src/context/applets/wikipedia/plugin/WikipediaEngine.h @@ -60,6 +60,7 @@ QString title() const { return m_title; } QString language() const { return preferredLangs.first(); } void setLanguage( const QString &language ); + Q_INVOKABLE void reloadWikipedia(); Q_SIGNALS: void pageChanged(); @@ -74,7 +75,6 @@ void fetchWikiUrl( const QString &title, const QString &urlPrefix ); void fetchLangLinks( const QString &title, const QString &hostLang, const QString &llcontinue = QString() ); void fetchListing( const QString &title, const QString &hostLang ); - void reloadWikipedia(); bool setSelection( const QString &type ); void updateEngine(); void wikiParse( QString &page ); diff --git a/src/context/applets/wikipedia/plugin/WikipediaEngine.cpp b/src/context/applets/wikipedia/plugin/WikipediaEngine.cpp --- a/src/context/applets/wikipedia/plugin/WikipediaEngine.cpp +++ b/src/context/applets/wikipedia/plugin/WikipediaEngine.cpp @@ -493,7 +493,7 @@ query.addQueryItem( QLatin1String("list"), QLatin1String("search") ); query.addQueryItem( QLatin1String("srsearch"), title ); query.addQueryItem( QLatin1String("srprop"), QLatin1String("size") ); - query.addQueryItem( QLatin1String("srredirects"), QString::number(1) ); + //query.addQueryItem( QLatin1String("srredirects"), QString::number(1) ); query.addQueryItem( QLatin1String("srlimit"), QString::number(20) ); query.addQueryItem( QLatin1String("format"), QLatin1String("xml") ); url.setQuery( query );