Falkon/falkonOfficial
Falkon/falkonOfficial
1
Fork 0
mirror of https://invent.kde.org/network/falkon.git synced 2024-09-21 17:52:10 +02:00
Code Releases Activity

Fixed opening target=_blank links in new tab.

Browse Source 
Regression from b7cc728d63610978dbac37238b00f0e08cf58ddc#L3R102
This commit is contained in:
nowrep 2013-01-27 20:49:22 +01:00
parent b70fc83474
commit 772440d86c
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/lib/popupwindow/popupwebpage.cpp
View File

@ -102,8 +102,10 @@ void PopupWebPage::checkBehaviour()
// If menubar/statusbar/toolbar visibility is explicitly set in window.open call,
// at least one of those variables will be false.
// If so, we should open new window.
// But not when all visibilities are false, it occurs with target=_blank links
if (!m_createNewWindow && (!m_menuBarVisible || !m_statusBarVisible || !m_toolBarVisible)) {
if (!m_createNewWindow && (!m_menuBarVisible || !m_statusBarVisible || !m_toolBarVisible)
&& !(!m_menuBarVisible && !m_statusBarVisible && !m_toolBarVisible)) {
m_createNewWindow = true;
}

27
tests/popupwindows.html
View File

@ -7,34 +7,43 @@
<h2>Popup windows test</h2>
<b>Will be opened in new tab</b>
<p>
<a href="popup.html" target="_blank">Classic link</a>
- target="_blank" link has to be opened in new tab
</p>
<p>
<a href="javascript:window.open('popup.html')">Popup 1</a>
- can be opened in new tab
</p>
<p>
<a href="javascript:window.open('popup.html', '_blank')">Popup 1</a>
<a href="javascript:window.open('popup.html', '_blank')">Popup 2</a>
- with second argument _blank
</p>
<p>
<a href="javascript:window.open('popup.html', '_blank', 'left=100,right=200')">Popup 3</a>
- with left and righ (should be opened as popup, but how to detect it?)
</p>
<b>Will be opened in popup window</b>
<p>
<a href="javascript:window.open('popup.html', '_blank', 'width=150,height=150')">Popup 1</a>
<a href="javascript:window.open('popup.html', '_blank', 'width=150,height=150')">Popup 4</a>
- with width and height
</p>
<p>
<a href="javascript:window.open('popup.html', '_blank', 'width=150,height=150,left=15,top=20')">Popup 1</a>
<a href="javascript:window.open('popup.html', '_blank', 'width=150,height=150,left=15,top=20')">Popup 5</a>
- with width, height, left and top
</p>
<p>
<a href="javascript:window.open('popup.html', '_blank', 'left=100,right=200')">Popup 1</a>
- with left and righ
</p>
<p>
<a href="javascript:window.open('popup.html', '_blank', 'menubar=yes')">Popup 1</a>
<a href="javascript:window.open('popup.html', '_blank', 'menubar=yes')">Popup 6</a>
- with menubar
</p>
<p>
<a href="javascript:window.open('popup.html', '_blank', 'status=yes')">Popup 1</a>
<a href="javascript:window.open('popup.html', '_blank', 'status=yes')">Popup 7</a>
- with statusbar
</p>
<p>
<p>
<a href="javascript:window.open('popup.html', '_blank', 'toolbar=yes')">Popup 8</a>
- with toolbar
</p>
<p>
</body>
</html>