Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-12-20 18:56:34 +01:00
Code Releases Activity

[LocationBar] Don't incorrectly show about to be loaded url when it was not accepted

Browse Source 
It can happen for example when trying to change address on a page that
handles window.onbeforeunload event
This commit is contained in:
nowrep 2014-02-10 21:58:25 +01:00
parent 28091f4957
commit 4e8c0adbad
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/navigation/locationbar.cpp
View File

@ -185,6 +185,11 @@ QUrl LocationBar::createUrl()
QString LocationBar::convertUrlToText(const QUrl &url) const QString LocationBar::convertUrlToText(const QUrl &url) const
{ {
// It was most probably entered by user, so don't urlencode it
if (url.scheme().isEmpty()) {
return url.toString();
}
QString stringUrl = QzTools::urlEncodeQueryString(url); QString stringUrl = QzTools::urlEncodeQueryString(url);
if (stringUrl == QLatin1String("qupzilla:speeddial") || stringUrl == QLatin1String("about:blank")) { if (stringUrl == QLatin1String("qupzilla:speeddial") || stringUrl == QLatin1String("about:blank")) {

3
src/lib/webview/webview.cpp
View File

@ -191,7 +191,6 @@ void WebView::load(const QNetworkRequest &request, QNetworkAccessManager::Operat
if (reqUrl.isEmpty() || isUrlValid(reqUrl)) { if (reqUrl.isEmpty() || isUrlValid(reqUrl)) {
QWebView::load(request, operation, body); QWebView::load(request, operation, body);
emit urlChanged(reqUrl);
m_aboutToLoadUrl = reqUrl; m_aboutToLoadUrl = reqUrl;
return; return;
} }
@ -200,8 +199,6 @@ void WebView::load(const QNetworkRequest &request, QNetworkAccessManager::Operat
const QUrl searchUrl = res.request.url(); const QUrl searchUrl = res.request.url();
QWebView::load(res.request, res.operation, res.data); QWebView::load(res.request, res.operation, res.data);
emit urlChanged(searchUrl);
m_aboutToLoadUrl = searchUrl; m_aboutToLoadUrl = searchUrl;
} }