diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-08-10 21:08:47 +0200 |
|---|---|---|
| committer | Olivier Hallot <olivier.hallot@libreoffice.org> | 2018-08-12 15:45:51 +0200 |
| commit | 7ab3eded419b6fddbdd9d7a7c1f676b3720950c0 (patch) | |
| tree | ea865e25214768bfbbc00f0d6a552c302230e432 /help3xsl/help.html | |
| parent | correct variable name in VBA example for WeekdayName function (diff) | |
| download | help-7ab3eded419b6fddbdd9d7a7c1f676b3720950c0.tar.gz help-7ab3eded419b6fddbdd9d7a7c1f676b3720950c0.zip | |
Use window.location.href = ...; instead of window.open(..., '_self');
Otherwise the interim URLs end up in the history.
Change-Id: If99aa1a29126f93387d2f5a6460cc0d43b488cd9
Reviewed-on: https://gerrit.libreoffice.org/58867
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hallot@libreoffice.org>
Diffstat (limited to 'help3xsl/help.html')
| -rw-r--r-- | help3xsl/help.html | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/help3xsl/help.html b/help3xsl/help.html index 1dade67f0d..acaf55b2d1 100644 --- a/help3xsl/help.html +++ b/help3xsl/help.html @@ -14,17 +14,17 @@ <body> <script type="text/javascript"> var url = window.location.href; - var n = url.indexOf('help.html?'); - if (n != -1){ - // the URL came from LibreOffice help (F1) - var version = getParameterByName("Version",url); - var rest = url.substr(n+12,url.length); - var newURL = version+'/index.html?'+rest; - window.open(newURL,'_self'); - }else{ - // URL came from elsewhere, direct access to webroot, we redirect to main Help page - var userLang = navigator.language || navigator.userLanguage; - window.open('latest/'+userLang+'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self'); + var n = url.indexOf('?'); + if (n != -1) { + // the URL came from LibreOffice help (F1) + var version = getParameterByName("Version", url); + var query = url.substr(n + 1, url.length); + var newURL = version + '/index.html?' + query; + window.location.href = newURL; + } else { + // URL came from elsewhere, direct access to webroot, we redirect to main Help page + var userLang = navigator.language || navigator.userLanguage; + window.location.href = 'latest/' + userLang + '/text/shared/main0108.html?&DbPAR=WRITER&System=WIN'; } </script> </body> |