Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

[desktop] refactoring

Browse source
This commit is contained in:
Maxim Kadushkin 2022-06-09 10:36:56 +03:00
parent b9ba820887
commit 42e2ae9277
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/common/main/lib/controller/Desktop.js
View file

@ -60,10 +60,12 @@ define([
'btn-save-coauth': 'coauth', 'btn-save-coauth': 'coauth',
'btn-synch': 'synch' }; 'btn-synch': 'synch' };
var is_win_xp = window.RendererProcessVariable && window.RendererProcessVariable.os === 'winxp'; var nativevars;
if ( !!native ) { if ( !!native ) {
native.features = native.features || {}; native.features = native.features || {};
nativevars = window.RendererProcessVariable;
window.on_native_message = function (cmd, param) { window.on_native_message = function (cmd, param) {
if (/^style:change/.test(cmd)) { if (/^style:change/.test(cmd)) {
var obj = JSON.parse(param); var obj = JSON.parse(param);
@ -207,6 +209,8 @@ define([
_.extend(config, opts); _.extend(config, opts);
if ( config.isDesktopApp ) { if ( config.isDesktopApp ) {
let is_win_xp = nativevars && nativevars.os === 'winxp';
Common.UI.Themes.setAvailable(!is_win_xp); Common.UI.Themes.setAvailable(!is_win_xp);
Common.NotificationCenter.on('app:ready', function (opts) { Common.NotificationCenter.on('app:ready', function (opts) {
_.extend(config, opts); _.extend(config, opts);

6
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -2088,12 +2088,12 @@ define([
store.fetch(config); store.fetch(config);
} else { } else {
if ( Common.Controllers.Desktop.isActive() ) { if ( Common.Controllers.Desktop.isActive() ) {
if ( store.contentLang === '{{DEFAULT_LANG}}' ) if ( store.contentLang === '{{DEFAULT_LANG}}' || !Common.Controllers.Desktop.helpUrl() )
me.iFrame.src = '../../common/main/resources/help/download.html'; me.iFrame.src = '../../common/main/resources/help/download.html';
else { else {
store.contentLang = store.contentLang === lang ? '{{DEFAULT_LANG}}' : lang; store.contentLang = store.contentLang === lang ? '{{DEFAULT_LANG}}' : lang;
me.urlPref = `${Common.Controllers.Desktop.helpUrl()}/${lang}/`; me.urlPref = Common.Controllers.Desktop.helpUrl() + '/' + lang + '/';
store.url = `${me.urlPref}/Contents.json`; store.url = me.urlPref + '/Contents.json';
store.fetch(config); store.fetch(config);
} }
} else { } else {