diff options
author | Michele Calgaro <[email protected]> | 2014-12-06 16:42:30 +0900 |
---|---|---|
committer | Michele Calgaro <[email protected]> | 2014-12-06 16:42:30 +0900 |
commit | 867bdce913ef0bd0f494b5fa34981300ee6b4186 (patch) | |
tree | 195c160cd06edc23efa9ef8681a20da88d952cad | |
parent | 5d7f38e7ca2074db1ba4eefa6b8b5329324e40d5 (diff) | |
parent | 687b1460b969af4f942233605abcca3a9b3c7f23 (diff) | |
download | tdebase-867bdce913ef0bd0f494b5fa34981300ee6b4186.tar.gz tdebase-867bdce913ef0bd0f494b5fa34981300ee6b4186.zip |
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tdebase
-rw-r--r-- | khelpcenter/mainwindow.cpp | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/khelpcenter/mainwindow.cpp b/khelpcenter/mainwindow.cpp index c2246232a..d99dfcb2b 100644 --- a/khelpcenter/mainwindow.cpp +++ b/khelpcenter/mainwindow.cpp @@ -293,6 +293,8 @@ void MainWindow::viewUrl( const TQString &url ) void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) { + KParts::URLArgs urlArgs = args; + stop(); TQString proto = url.protocol().lower(); @@ -323,7 +325,15 @@ void MainWindow::viewUrl( const KURL &url, const KParts::URLArgs &args ) History::self().createEntry(); - mDoc->browserExtension()->setURLArgs( args ); + if (mDoc->baseURL() != url) { + if ( proto == "help" ) { + // Ensure that changing the handbook section works by forcing a reload of the page, + // thereby allowing the help tdeioslave to re-parse the fragment identifier + urlArgs.reload = true; + mDoc->gotoAnchor(""); + } + } + mDoc->browserExtension()->setURLArgs( urlArgs ); if ( proto == TQString::fromLatin1("glossentry") ) { TQString decodedEntryId = KURL::decode_string( url.encodedPathAndQuery() ); |