hashirama/goldendict-ng
hashirama/goldendict-ng
0
0
Fork 0
mirror of https://github.com/xiaoyifang/goldendict-ng.git synced 2024-11-27 19:24:08 +00:00
Code Issues Actions 1 Projects Releases Wiki Activity

Fix anchor handling in Qt 5 builds

Browse source
This commit is contained in:
Abs62 2016-04-01 16:38:07 +03:00
parent 07dc06dc96
commit 1f97957621
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
articleview.cc
View file

@ -517,10 +517,10 @@ void ArticleView::loadFinished( bool )
{ {
// Anchor found, jump to it // Anchor found, jump to it
url.clear();
url.setFragment( rx.cap( 0 ) ); url.setFragment( rx.cap( 0 ) );
ui.definition->page()->mainFrame()->evaluateJavaScript( ui.definition->page()->mainFrame()->evaluateJavaScript(
QString( "window.location = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) ); QString( "window.location.hash = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
break; break;
} }
@ -528,9 +528,10 @@ void ArticleView::loadFinished( bool )
} }
else else
{ {
url.clear();
url.setFragment( anchor ); url.setFragment( anchor );
ui.definition->page()->mainFrame()->evaluateJavaScript( ui.definition->page()->mainFrame()->evaluateJavaScript(
QString( "window.location = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) ); QString( "window.location.hash = \"%1\"" ).arg( QString::fromUtf8( url.toEncoded() ) ) );
} }
} }
#endif #endif
@ -543,7 +544,8 @@ void ArticleView::loadFinished( bool )
void ArticleView::handleTitleChanged( QString const & title ) void ArticleView::handleTitleChanged( QString const & title )
{ {
emit titleChanged( this, title ); if( !title.isEmpty() ) // Qt 5.x WebKit raise signal titleChanges(QString()) while navigation within page
emit titleChanged( this, title );
} }
void ArticleView::handleUrlChanged( QUrl const & url ) void ArticleView::handleUrlChanged( QUrl const & url )