diff options
| author | Jan Holesovsky <kendy@collabora.com> | 2018-08-10 21:08:47 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2018-08-10 21:42:40 +0200 |
| commit | 2b9bf1dfbef3410f0acaf2ef0cc968664d931144 (patch) | |
| tree | 860c7ec6d9ab7229dcd5d991f9e3da3d1ef33eb6 | |
| parent | b85da9f65fc75dec1077e8dee847c0c9b8a42307 (diff) | |
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/58861
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
| -rw-r--r-- | help3xsl/help.html | 4 | ||||
| -rw-r--r-- | help3xsl/index2.html | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/help3xsl/help.html b/help3xsl/help.html index 9bb30b5dca..e63435b45c 100644 --- a/help3xsl/help.html +++ b/help3xsl/help.html @@ -35,11 +35,11 @@ var version = getParameterByName("Version", url); var query = url.substr(n + 1, url.length); var newURL = version + '/index.html?' + query; - window.open(newURL, '_self'); + 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.open('latest/' + userLang + '/text/shared/main0108.html?&DbPAR=WRITER&System=WIN', '_self'); + window.location.href = 'latest/' + userLang + '/text/shared/main0108.html?&DbPAR=WRITER&System=WIN'; } </script> </body> diff --git a/help3xsl/index2.html b/help3xsl/index2.html index affbba4ac3..4f7c744e27 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -51,14 +51,14 @@ file = file.substr(0,indx); var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' + module + bm; } - window.open(newURL,'_self'); + window.location.href = newURL; } else { // URL came from elsewhere, direct access to webroot, we redirect to main Help page var userLang = navigator.language; if (userLang === undefined) { userlang="en-US"; } - window.open(userLang + '/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self'); + window.location.href = userLang + '/text/shared/main0108.html?&DbPAR=WRITER&System=WIN'; } </script> </body> |