Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-11-14 02:52:12 +01:00
Code Releases Activity

[WebView] Better window.onbeforeunload handling

Browse Source 
Let's first quickly check whether window.onbeforeunload is not null,
and then try to load empty page.
Always loading empty page was quite heavy, because it needed to clear
all web contents, it also fired loading signals, ...
This commit is contained in:
nowrep 2014-02-10 18:38:47 +01:00
parent d328ad2023
commit b88bbe4fc8
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lib/webview/tabwidget.cpp
View File

@ -39,6 +39,7 @@
#include <QStackedWidget> #include <QStackedWidget>
#include <QMouseEvent> #include <QMouseEvent>
#include <QWebHistory> #include <QWebHistory>
#include <QWebFrame>
#include <QClipboard> #include <QClipboard>
#include <QFile> #include <QFile>
#include <QScrollArea> #include <QScrollArea>
@ -467,10 +468,12 @@ void TabWidget::closeTab(int index, bool force)
} }
} }
// window.beforeunload handling // window.onbeforeunload handling
webView->load(QUrl()); if (!webView->page()->mainFrame()->evaluateJavaScript("window.onbeforeunload===null").toBool()) {
if (webView->url() != QUrl()) { webView->load(QUrl());
return; if (webView->url() != QUrl()) {
return;
}
} }
m_locationBars->removeWidget(webView->webTab()->locationBar()); m_locationBars->removeWidget(webView->webTab()->locationBar());