[all] for bug 59316

This commit is contained in:
Maxim Kadushkin 2022-11-08 15:59:56 +03:00
parent 90d2f75c4c
commit 90c23f6370
6 changed files with 27 additions and 6 deletions

View file

@ -69,7 +69,7 @@ define([
if (item.options.action === 'help') {
if ( panel.noHelpContents === true && navigator.onLine ) {
this.fireEvent('item:click', [this, 'external-help', true]);
window.open(panel.urlHelpCenter, '_blank');
!!panel.urlHelpCenter && window.open(panel.urlHelpCenter, '_blank');
return;
}
}

View file

@ -2019,7 +2019,14 @@ define([
this.menu = options.menu;
this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
this.openUrl = null;
this.urlHelpCenter = '{{HELP_CENTER_WEB_DE}}';
if ( !Common.Utils.isIE ) {
if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_DE}}') ) {
const _url_obj = new URL('{{HELP_CENTER_WEB_DE}}');
_url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
this.urlHelpCenter = _url_obj.toString();
}
}
this.en_data = [
{"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Document Editor user interface", "headername": "Program Interface"},

View file

@ -72,7 +72,7 @@ define([
if (item.options.action === 'help') {
if ( panel.noHelpContents === true && navigator.onLine ) {
this.fireEvent('item:click', [this, 'external-help', true]);
window.open(panel.urlHelpCenter, '_blank');
!!panel.urlHelpCenter && window.open(panel.urlHelpCenter, '_blank');
return;
}
}

View file

@ -1512,7 +1512,14 @@ define([
this.menu = options.menu;
this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
this.openUrl = null;
this.urlHelpCenter = '{{HELP_CENTER_WEB_PE}}';
if ( !Common.Utils.isIE ) {
if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_PE}}') ) {
const _url_obj = new URL('{{HELP_CENTER_WEB_PE}}');
_url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
this.urlHelpCenter = _url_obj.toString();
}
}
this.en_data = [
{"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Presentation Editor user interface", "headername": "Program Interface"},

View file

@ -59,7 +59,7 @@ define([
if (item.options.action === 'help') {
if ( panel.noHelpContents === true && navigator.onLine ) {
this.fireEvent('item:click', [this, 'external-help', true]);
window.open(panel.urlHelpCenter, '_blank');
!!panel.urlHelpCenter && window.open(panel.urlHelpCenter, '_blank');
return;
}
}

View file

@ -1900,7 +1900,14 @@ SSE.Views.FileMenuPanels.RecentFiles = Common.UI.BaseView.extend({
this.menu = options.menu;
this.urlPref = 'resources/help/{{DEFAULT_LANG}}/';
this.openUrl = null;
this.urlHelpCenter = '{{HELP_CENTER_WEB_SSE}}';
if ( !Common.Utils.isIE ) {
if ( /^https?:\/\//.test('{{HELP_CENTER_WEB_SSE}}') ) {
const _url_obj = new URL('{{HELP_CENTER_WEB_SSE}}');
_url_obj.searchParams.set('lang', Common.Locale.getCurrentLanguage());
this.urlHelpCenter = _url_obj.toString();
}
}
this.en_data = [
{"src": "ProgramInterface/ProgramInterface.htm", "name": "Introducing Spreadsheet Editor user interface", "headername": "Program Interface"},