[Libreoffice-commits] help.git: Branch 'distro/collabora/cp-6.0' - help3xsl/help.html help3xsl/index2.html

[Libreoffice Gerrit user]

 help3xsl/help.html   |    4 ++--
 help3xsl/index2.html |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 2b9bf1dfbef3410f0acaf2ef0cc968664d931144
Author:     Jan Holesovsky <kendy at collabora.com>
AuthorDate: Fri Aug 10 21:08:47 2018 +0200
Commit:     Andras Timar <andras.timar at collabora.com>
CommitDate: Fri Aug 10 21:42:40 2018 +0200

    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 at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/help3xsl/help.html b/help3xsl/help.html
index 9bb30b5dc..e63435b45 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 affbba4ac..4f7c744e2 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>