help3xsl/help.html | 4 +--- help3xsl/index.html | 3 +-- help3xsl/index2.html | 1 - 3 files changed, 2 insertions(+), 6 deletions(-)
New commits: commit e76947a271da80e60ef658a9795fd95b6f26476a Author: Jan Holesovsky <[email protected]> AuthorDate: Wed Aug 15 08:54:28 2018 +0200 Commit: Jan Holesovsky <[email protected]> CommitDate: Thu Aug 16 09:18:53 2018 +0200 The <version>/index.html can default correctly, no need to do it in the root. Change-Id: If74aaea6924638f9fef647121da4a35c66fc0213 Reviewed-on: https://gerrit.libreoffice.org/59048 Tested-by: Jenkins Reviewed-by: Jan Holesovsky <[email protected]> diff --git a/help3xsl/help.html b/help3xsl/help.html index e63435b45..21afd2ff4 100644 --- a/help3xsl/help.html +++ b/help3xsl/help.html @@ -37,9 +37,7 @@ 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'; + window.location.href = 'latest/index.html'; } </script> </body> diff --git a/help3xsl/index.html b/help3xsl/index.html index fcaa9bdda..9f4dae946 100644 --- a/help3xsl/index.html +++ b/help3xsl/index.html @@ -12,8 +12,7 @@ </head> <body> <script type="text/javascript"> - var userLang = navigator.language || navigator.userLanguage; - window.open('latest/'+userLang+'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN','_self'); + window.location.href = 'latest/index.html'; </script> </body> </html> diff --git a/help3xsl/index2.html b/help3xsl/index2.html index ad1232043..8b58a4f6e 100644 --- a/help3xsl/index2.html +++ b/help3xsl/index2.html @@ -20,7 +20,6 @@ if (n != -1) { // the URL came from LibreOffice help (F1) var target = getParameterByName("Target",url); - var version = getParameterByName("Version",url); var lang = existingLang(getParameterByName("Language", url)); var system = getParameterByName("System",url); var module; _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
