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

Merge pull request #1605 from ONLYOFFICE/fix/merge-hotfix

Browse source 
Fix/merge hotfix
This commit is contained in:
Julia Radzhabova 2022-03-01 17:47:15 +03:00 committed by GitHub
parent db0b59354a 0b1b2508d5
commit 64208635dd
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 38 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/common/main/lib/controller/HintManager.js
View file

@ -492,7 +492,9 @@ Common.UI.HintManager = new(function() {
match = false; match = false;
var keyCode = e.keyCode; var keyCode = e.keyCode;
if (keyCode !== 16 && keyCode !== 17 && keyCode !== 18 && keyCode !== 91) { if (keyCode !== 16 && keyCode !== 17 && keyCode !== 18 && keyCode !== 91) {
curLetter = _lang === 'en' ? ((keyCode > 47 && keyCode < 58 || keyCode > 64 && keyCode < 91) ? String.fromCharCode(e.keyCode) : null) : e.key; curLetter = _lang === 'en' ?
((keyCode > 47 && keyCode < 58 || keyCode > 64 && keyCode < 91) ? String.fromCharCode(e.keyCode) : null) :
(/[.*+?^${}()|[\]\\]/g.test(e.key) ? null : e.key);
} }
if (curLetter) { if (curLetter) {
var curr; var curr;

4
apps/common/main/lib/view/About.js
View file

@ -235,10 +235,10 @@ define([
this.lblCompanyLic.parents('tr').addClass('hidden'); this.lblCompanyLic.parents('tr').addClass('hidden');
value = Common.UI.Themes.isDarkTheme() ? (customer.logoDark || customer.logo) : (customer.logo || customer.logoDark); value = Common.UI.Themes.isDarkTheme() ? (customer.logoDark || customer.logo) : (customer.logo || customer.logoDark);
value.length ? value && value.length ?
this.divCompanyLogo.html('<img src="'+value+'" style="max-width:216px; max-height: 35px;" />') : this.divCompanyLogo.html('<img src="'+value+'" style="max-width:216px; max-height: 35px;" />') :
this.divCompanyLogo.parents('tr').addClass('hidden'); this.divCompanyLogo.parents('tr').addClass('hidden');
value.length && Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this)); value && value.length && Common.NotificationCenter.on('uitheme:changed', this.changeLogo.bind(this));
} else { } else {
this.cntLicenseeInfo.addClass('hidden'); this.cntLicenseeInfo.addClass('hidden');
this.cntLicensorInfo.addClass('margin-bottom'); this.cntLicensorInfo.addClass('margin-bottom');

22
apps/documenteditor/forms/app/controller/ApplicationController.js
View file

@ -104,6 +104,8 @@ define([
this.api.asc_registerCallback('asc_onCurrentPage', this.onCurrentPage.bind(this)); this.api.asc_registerCallback('asc_onCurrentPage', this.onCurrentPage.bind(this));
this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this)); this.api.asc_registerCallback('asc_onDocumentModifiedChanged', _.bind(this.onDocumentModifiedChanged, this));
this.api.asc_registerCallback('asc_onZoomChange', this.onApiZoomChange.bind(this)); this.api.asc_registerCallback('asc_onZoomChange', this.onApiZoomChange.bind(this));
this.api.asc_registerCallback('asc_onCoAuthoringDisconnect', _.bind(this.onApiServerDisconnect, this));
Common.NotificationCenter.on('api:disconnect', _.bind(this.onApiServerDisconnect, this));
// Initialize api gateway // Initialize api gateway
Common.Gateway.on('init', this.loadConfig.bind(this)); Common.Gateway.on('init', this.loadConfig.bind(this));
@ -678,7 +680,7 @@ define([
} }
if (this._state.licenseType!==Asc.c_oLicenseResult.SuccessLimit && this.appOptions.canFillForms) { if (this._state.licenseType!==Asc.c_oLicenseResult.SuccessLimit && this.appOptions.canFillForms) {
this.disableEditing(true); Common.NotificationCenter.trigger('api:disconnect');
} }
var value = Common.localStorage.getItem("de-license-warning"); var value = Common.localStorage.getItem("de-license-warning");
@ -1811,9 +1813,21 @@ define([
} }
}, },
disableEditing: function(state) { onApiServerDisconnect: function(enableDownload) {
this.view && this.view.btnClear && this.view.btnClear.setDisabled(state); this._state.isDisconnected = true;
this._isDisabled = state; this._isDisabled = true;
this.view && this.view.btnClear && this.view.btnClear.setDisabled(true);
if (!enableDownload) {
this.appOptions.canPrint = this.appOptions.canDownload = false;
this.view && this.view.btnDownload.setDisabled(true);
this.view && this.view.btnSubmit.setDisabled(true);
if (this.view && this.view.btnOptions && this.view.btnOptions.menu) {
this.view.btnOptions.menu.items[0].setDisabled(true); // print
this.view.btnOptions.menu.items[2].setDisabled(true); // download
this.view.btnOptions.menu.items[3].setDisabled(true); // download docx
this.view.btnOptions.menu.items[4].setDisabled(true); // download pdf
}
}
}, },
errorDefaultMessage : 'Error code: %1', errorDefaultMessage : 'Error code: %1',

10
apps/documenteditor/mobile/src/store/textSettings.js
View file

@ -101,11 +101,11 @@ export class storeTextSettings {
this.thumbCanvas = document.createElement('canvas'); this.thumbCanvas = document.createElement('canvas');
this.thumbContext = this.thumbCanvas.getContext('2d'); this.thumbContext = this.thumbCanvas.getContext('2d');
this.thumbs = [ this.thumbs = [
{ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, {ratio: 1, path: '../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight},
{ratio: 1.25, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25}, {ratio: 1.25, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25},
{ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, {ratio: 1.5, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5},
{ratio: 1.75, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75}, {ratio: 1.75, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75},
{ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} {ratio: 2, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2}
]; ];
const applicationPixelRatio = Common.Utils.applicationPixelRatio(); const applicationPixelRatio = Common.Utils.applicationPixelRatio();

10
apps/presentationeditor/mobile/src/store/textSettings.js
View file

@ -105,11 +105,11 @@ export class storeTextSettings {
this.thumbCanvas = document.createElement('canvas'); this.thumbCanvas = document.createElement('canvas');
this.thumbContext = this.thumbCanvas.getContext('2d'); this.thumbContext = this.thumbCanvas.getContext('2d');
this.thumbs = [ this.thumbs = [
{ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, {ratio: 1, path: '../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight},
{ratio: 1.25, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25}, {ratio: 1.25, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25},
{ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, {ratio: 1.5, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5},
{ratio: 1.75, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75}, {ratio: 1.75, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75},
{ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} {ratio: 2, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2}
]; ];
const applicationPixelRatio = Common.Utils.applicationPixelRatio(); const applicationPixelRatio = Common.Utils.applicationPixelRatio();

10
apps/spreadsheeteditor/mobile/src/store/textSettings.js
View file

@ -105,11 +105,11 @@ export class storeTextSettings {
this.thumbCanvas = document.createElement('canvas'); this.thumbCanvas = document.createElement('canvas');
this.thumbContext = this.thumbCanvas.getContext('2d'); this.thumbContext = this.thumbCanvas.getContext('2d');
this.thumbs = [ this.thumbs = [
{ratio: 1, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight}, {ratio: 1, path: '../../../../../sdkjs/common/Images/fonts_thumbnail.png', width: this.iconWidth, height: this.iconHeight},
{ratio: 1.25, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25}, {ratio: 1.25, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.25x.png', width: this.iconWidth * 1.25, height: this.iconHeight * 1.25},
{ratio: 1.5, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5}, {ratio: 1.5, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.5x.png', width: this.iconWidth * 1.5, height: this.iconHeight * 1.5},
{ratio: 1.75, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75}, {ratio: 1.75, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@1.75x.png', width: this.iconWidth * 1.75, height: this.iconHeight * 1.75},
{ratio: 2, path: '../../../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2} {ratio: 2, path: '../../../../../sdkjs/common/Images/fonts_thumbnail@2x.png', width: this.iconWidth * 2, height: this.iconHeight * 2}
]; ];
const applicationPixelRatio = Common.Utils.applicationPixelRatio(); const applicationPixelRatio = Common.Utils.applicationPixelRatio();