help3xsl/help.html | 22 ++++++-------
help3xsl/index2.html | 86 +++++++++++++++++++++++++--------------------------
2 files changed, 54 insertions(+), 54 deletions(-)
New commits:
commit 7ab3eded419b6fddbdd9d7a7c1f676b3720950c0
Author: Jan Holesovsky <ke...@collabora.com>
AuthorDate: Fri Aug 10 21:08:47 2018 +0200
Commit: Olivier Hallot <olivier.hal...@libreoffice.org>
CommitDate: Sun Aug 12 15:45:51 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/58867
Tested-by: Jenkins
Reviewed-by: Olivier Hallot <olivier.hal...@libreoffice.org>
diff --git a/help3xsl/help.html b/help3xsl/help.html
index 1dade67f0..acaf55b2d 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>
diff --git a/help3xsl/index2.html b/help3xsl/index2.html
index 6ca41cc90..4f7c744e2 100644
--- a/help3xsl/index2.html
+++ b/help3xsl/index2.html
@@ -16,49 +16,49 @@
<script type="text/javascript">
var url = window.location.href;
var n = url.indexOf('index.html?');
- if (n != -1){
- // the URL came from LibreOffice help (F1)
- var version = getParameterByName("Version",url);
- var lang = getParameterByName("Language",url);
- var system = getParameterByName("System",url);
- var rest= url.substr(n+11,url.length);
- var module;
- var defaultFile;
- var smodule = rest.substr(0, rest.indexOf('/'));
- switch (smodule) {
- case "swriter":
{defaultFile='text/swriter/main0000.html';module="WRITER";break;}
- case "scalc":
{defaultFile='text/scalc/main0000.html';module="CALC";break;}
- case "simpress":
{defaultFile='text/simpress/main0000.html';module="IMPRESS";break;}
- case "sdraw":
{defaultFile='text/sdraw/main0000.html';module="DRAW";break;}
- case "smath":
{defaultFile='text/smath/main0000.html';module="MATH";break;}
- case "sdatabase":
{defaultFile='text/shared/explorer/database/main.html';module="BASE";break;}
- case "sbasic":
{defaultFile='text/sbasic/shared/main0601.html';module="BASIC";break;}
- default:
{defaultFile='text/shared/main0000.html';module="WRITER";break;}
- }
- var bookmark = rest.slice(rest.indexOf('/')+1, rest.indexOf('?'));
- var file = map[bookmark];
- // check first if a root bookmark @@nowidget@@ can be used
- if (file === undefined){
- var b2 = bookmark.substring(0, bookmark.lastIndexOf("/")) +
'/@@nowidget@@';
- file = map[b2];
- }
- // rebuild URL
- if (file === undefined){
- var newURL = lang + '/' + defaultFile + '?System=' + system + '&DbPAR=' +
module;
- }else{
- var indx = file.indexOf('#');
- var bm = file.substr(indx,file.length);
- file = file.substr(0,indx);
- var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' + module
+ bm;
- }
- window.open(newURL,'_self');
- }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');
+ if (n != -1) {
+ // the URL came from LibreOffice help (F1)
+ var target = getParameterByName("Target",url);
+ var version = getParameterByName("Version",url);
+ var lang = getParameterByName("Language",url);
+ var system = getParameterByName("System",url);
+ var module;
+ var defaultFile;
+ var smodule = target.substr(0, target.indexOf('/'));
+ switch (smodule) {
+ case "swriter":
{defaultFile='text/swriter/main0000.html';module="WRITER";break;}
+ case "scalc":
{defaultFile='text/scalc/main0000.html';module="CALC";break;}
+ case "simpress":
{defaultFile='text/simpress/main0000.html';module="IMPRESS";break;}
+ case "sdraw":
{defaultFile='text/sdraw/main0000.html';module="DRAW";break;}
+ case "smath":
{defaultFile='text/smath/main0000.html';module="MATH";break;}
+ case "sdatabase":
{defaultFile='text/shared/explorer/database/main.html';module="BASE";break;}
+ case "sbasic":
{defaultFile='text/sbasic/shared/main0601.html';module="BASIC";break;}
+ default:
{defaultFile='text/shared/main0000.html';module="WRITER";break;}
+ }
+ var bookmark = target.slice(target.indexOf('/') + 1, target.length);
+ var file = map[bookmark];
+ // check first if a root bookmark @@nowidget@@ can be used
+ if (file === undefined) {
+ var b2 = bookmark.substring(0, bookmark.lastIndexOf("/")) +
'/@@nowidget@@';
+ file = map[b2];
+ }
+ // rebuild URL
+ if (file === undefined) {
+ var newURL = lang + '/' + defaultFile + '?System=' + system +
'&DbPAR=' + module;
+ } else {
+ var indx = file.indexOf('#');
+ var bm = file.substr(indx,file.length);
+ file = file.substr(0,indx);
+ var newURL = lang + '/' + file + '?System=' + system + '&DbPAR=' +
module + bm;
+ }
+ 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.location.href = userLang +
'/text/shared/main0108.html?&DbPAR=WRITER&System=WIN';
}
</script>
</body>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
