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

Merge pull request #1358 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-11-26 17:20:17 +03:00 committed by GitHub
parent 9e8e78ada2 25a4368e59
commit 2498ffd30a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 59 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
apps/documenteditor/embed/js/ApplicationController.js
View file

@ -121,6 +121,7 @@ DE.ApplicationController = new(function(){
docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey);
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(config.callbackUrl);
docInfo.put_Token(docConfig.token);
docInfo.put_Permissions(_permissions);
docInfo.put_EncryptedInfo(config.encryptionKeys);
@ -693,6 +694,10 @@ DE.ApplicationController = new(function(){
message = me.convertationErrorText;
break;
case Asc.c_oAscError.ID.ConvertationOpenError:
message = me.openErrorText;
break;
case Asc.c_oAscError.ID.DownloadError:
message = me.downloadErrorText;
break;
@ -945,6 +950,7 @@ DE.ApplicationController = new(function(){
txtEmpty: '(Empty)',
txtPressLink: 'Press Ctrl and click link',
errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
openErrorText: 'An error has occurred while opening the file'
}
})();

1
apps/documenteditor/embed/locale/en.json
View file

@ -38,6 +38,7 @@
"DE.ApplicationController.unknownErrorText": "Unknown error.",
"DE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
"DE.ApplicationController.waitText": "Please, wait...",
"DE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
"DE.ApplicationView.txtDownload": "Download",
"DE.ApplicationView.txtDownloadDocx": "Download as docx",
"DE.ApplicationView.txtDownloadPdf": "Download as pdf",

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

@ -189,6 +189,10 @@ define([
config.msg = this.convertationErrorText;
break;
case Asc.c_oAscError.ID.ConvertationOpenError:
config.msg = this.openErrorText;
break;
case Asc.c_oAscError.ID.DownloadError:
config.msg = this.downloadErrorText;
break;
@ -1535,7 +1539,8 @@ define([
txtArt: 'Your text here',
txtChoose: 'Choose an item',
txtEnterDate: 'Enter a date',
txtClickToLoad: 'Click to load image'
txtClickToLoad: 'Click to load image',
openErrorText: 'An error has occurred while opening the file'
}, DE.Controllers.ApplicationController));

1
apps/documenteditor/forms/locale/en.json
View file

@ -112,6 +112,7 @@
"DE.Controllers.ApplicationController.txtClickToLoad": "Click to load image",
"DE.Controllers.ApplicationController.txtArt": "Your text here",
"DE.Controllers.ApplicationController.txtEnterDate": "Enter a date",
"DE.Controllers.ApplicationController.openErrorText": "An error has occurred while opening the file.",
"DE.Views.ApplicationView.textClear": "Clear All Fields",
"DE.Views.ApplicationView.textCopy": "Copy",
"DE.Views.ApplicationView.textCut": "Cut",

3
apps/documenteditor/main/app/view/FormSettings.js
View file

@ -280,6 +280,9 @@ define([
this.lockedControls.push(this.txtNewValue);
this.txtNewValue.on('inputleave', function(){ me.fireEvent('editcomplete', me);});
this.txtNewValue._input.on('keydown', _.bind(this.onNewValueKeydown, this));
this.txtNewValue.cmpEl.on('focus', 'input.form-control', function() {
setTimeout(function(){me.txtNewValue._input && me.txtNewValue._input.select();}, 1);
});
this.list = new Common.UI.ListView({
el: $markup.findById('#form-list-list'),

8
apps/presentationeditor/embed/js/ApplicationController.js
View file

@ -119,6 +119,7 @@ PE.ApplicationController = new(function(){
docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey);
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(config.callbackUrl);
docInfo.put_Token(docConfig.token);
docInfo.put_Permissions(_permissions);
docInfo.put_EncryptedInfo(config.encryptionKeys);
@ -538,6 +539,10 @@ PE.ApplicationController = new(function(){
message = me.convertationErrorText;
break;
case Asc.c_oAscError.ID.ConvertationOpenError:
message = me.openErrorText;
break;
case Asc.c_oAscError.ID.DownloadError:
message = me.downloadErrorText;
break;
@ -740,6 +745,7 @@ PE.ApplicationController = new(function(){
textAnonymous: 'Anonymous',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
openErrorText: 'An error has occurred while opening the file'
}
})();

1
apps/presentationeditor/embed/locale/en.json
View file

@ -28,6 +28,7 @@
"PE.ApplicationController.unknownErrorText": "Unknown error.",
"PE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
"PE.ApplicationController.waitText": "Please, wait...",
"PE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
"PE.ApplicationView.txtDownload": "Download",
"PE.ApplicationView.txtEmbed": "Embed",
"PE.ApplicationView.txtFileLocation": "Open file location",

8
apps/spreadsheeteditor/embed/js/ApplicationController.js
View file

@ -119,6 +119,7 @@ SSE.ApplicationController = new(function(){
docInfo.put_Format(docConfig.fileType);
docInfo.put_VKey(docConfig.vkey);
docInfo.put_UserInfo(_user);
docInfo.put_CallbackUrl(config.callbackUrl);
docInfo.put_Token(docConfig.token);
docInfo.put_Permissions(_permissions);
docInfo.put_EncryptedInfo(config.encryptionKeys);
@ -449,6 +450,10 @@ SSE.ApplicationController = new(function(){
message = me.convertationErrorText;
break;
case Asc.c_oAscError.ID.ConvertationOpenError:
message = me.openErrorText;
break;
case Asc.c_oAscError.ID.DownloadError:
message = me.downloadErrorText;
break;
@ -689,6 +694,7 @@ SSE.ApplicationController = new(function(){
textAnonymous: 'Anonymous',
errorForceSave: "An error occurred while saving the file. Please use the 'Download as' option to save the file to your computer hard drive or try again later.",
errorLoadingFont: 'Fonts are not loaded.<br>Please contact your Document Server administrator.',
errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.'
errorTokenExpire: 'The document security token has expired.<br>Please contact your Document Server administrator.',
openErrorText: 'An error has occurred while opening the file'
}
})();

1
apps/spreadsheeteditor/embed/locale/en.json
View file

@ -28,6 +28,7 @@
"SSE.ApplicationController.unknownErrorText": "Unknown error.",
"SSE.ApplicationController.unsupportedBrowserErrorText": "Your browser is not supported.",
"SSE.ApplicationController.waitText": "Please, wait...",
"SSE.ApplicationController.openErrorText": "An error has occurred while opening the file.",
"SSE.ApplicationView.txtDownload": "Download",
"SSE.ApplicationView.txtEmbed": "Embed",
"SSE.ApplicationView.txtFileLocation": "Open file location",

11
apps/spreadsheeteditor/main/app/controller/RightMenu.js
View file

@ -186,6 +186,7 @@ define([
}
this._settings[Common.Utils.documentSettingsType.Signature].locked = false;
var locktext = false;
for (i=0; i<SelectedObjects.length; ++i)
{
var eltype = SelectedObjects[i].asc_getObjectType(),
@ -195,6 +196,7 @@ define([
var value = SelectedObjects[i].asc_getObjectValue();
if (settingsType == Common.Utils.documentSettingsType.Image) {
locktext = locktext || value.asc_getProtectionLockText();
if (value.asc_getChartProperties() !== null) {
settingsType = Common.Utils.documentSettingsType.Chart;
this._settings[settingsType].btn.updateHint(this.rightmenu.txtChartSettings);
@ -203,20 +205,23 @@ define([
if (value.asc_getShapeProperties().asc_getTextArtProperties()) {
this._settings[Common.Utils.documentSettingsType.TextArt].props = value;
this._settings[Common.Utils.documentSettingsType.TextArt].hidden = 0;
this._settings[Common.Utils.documentSettingsType.TextArt].locked = value.asc_getLocked() || this._state.wsProps['Objects'];
this._settings[Common.Utils.documentSettingsType.TextArt].locked = value.asc_getLocked() || this._state.wsProps['Objects'] && value.asc_getProtectionLockText();
}
} else if (value.asc_getSlicerProperties() !== null) {
settingsType = Common.Utils.documentSettingsType.Slicer;
}
this._settings[settingsType].locked = value.asc_getLocked() || this._state.wsProps['Objects'] && value.asc_getProtectionLocked();
} else {
this._settings[settingsType].locked = value.asc_getLocked();
}
this._settings[settingsType].props = value;
this._settings[settingsType].hidden = 0;
this._settings[settingsType].locked = value.asc_getLocked() || this._state.wsProps['Objects'];
if (!this._settings[Common.Utils.documentSettingsType.Signature].locked) // lock Signature, если хотя бы один объект locked
this._settings[Common.Utils.documentSettingsType.Signature].locked = value.asc_getLocked();
if (!this._settings[Common.Utils.documentSettingsType.Paragraph].locked) // lock Paragraph, если хотя бы у одной автофигуры заблокирован текст
this._settings[Common.Utils.documentSettingsType.Paragraph].locked = this._state.wsProps['Objects'] && locktext;
}
if (formatTableInfo) {

18
apps/spreadsheeteditor/main/app/controller/Toolbar.js
View file

@ -193,7 +193,9 @@ define([
cf_locked: [],
selectedCells: 0,
wsLock: false,
wsProps: []
wsProps: [],
is_lockText: false,
is_lockShape: false
};
this.binding = {};
@ -2544,7 +2546,8 @@ define([
// lock formatting controls in cell with FormatCells protection or in shape and Objects protection
need_disable = (selectionType === Asc.c_oAscSelectionType.RangeImage || selectionType === Asc.c_oAscSelectionType.RangeChart || selectionType === Asc.c_oAscSelectionType.RangeChartText ||
selectionType === Asc.c_oAscSelectionType.RangeShape || selectionType === Asc.c_oAscSelectionType.RangeShapeText || selectionType === Asc.c_oAscSelectionType.RangeSlicer);
toolbar.lockToolbar(SSE.enumLock.wsLockFormat, need_disable && !!this._state.wsProps['Objects'] || !need_disable && !!this._state.wsProps['FormatCells']);
toolbar.lockToolbar(SSE.enumLock.wsLockFormat, need_disable && !!this._state.wsProps['Objects'] && !!this._state.is_lockText || !need_disable && !!this._state.wsProps['FormatCells']);
toolbar.lockToolbar(SSE.enumLock.wsLockFormatFill, need_disable && !!this._state.wsProps['Objects'] && !!this._state.is_lockShape || !need_disable && !!this._state.wsProps['FormatCells']);
toolbar.lockToolbar(SSE.enumLock['Objects'], !!this._state.wsProps['Objects']);
toolbar.lockToolbar(SSE.enumLock['FormatCells'], !!this._state.wsProps['FormatCells']);
@ -3466,7 +3469,9 @@ define([
is_image = seltype == Asc.c_oAscSelectionType.RangeImage,
is_slicer = seltype == Asc.c_oAscSelectionType.RangeSlicer,
is_mode_2 = is_shape_text || is_shape || is_chart_text || is_chart || is_slicer,
is_objLocked = false;
is_objLocked = false,
is_lockShape = false,
is_lockText = false;
if (!(is_mode_2 || is_image) && this._state.selection_type===seltype && this._state.coauthdisable===coauth_disable) return (seltype===Asc.c_oAscSelectionType.RangeImage);
@ -3474,9 +3479,14 @@ define([
var SelectedObjects = this.api.asc_getGraphicObjectProps();
for (var i=0; i<SelectedObjects.length; ++i)
{
if (SelectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image)
if (SelectedObjects[i].asc_getObjectType() == Asc.c_oAscTypeSelectElement.Image) {
is_objLocked = is_objLocked || SelectedObjects[i].asc_getObjectValue().asc_getLocked();
is_lockText = is_lockText || SelectedObjects[i].asc_getObjectValue().asc_getProtectionLockText();
is_lockShape = is_lockShape || SelectedObjects[i].asc_getObjectValue().asc_getProtectionLocked();
}
}
this._state.is_lockText = is_lockText;
this._state.is_lockShape = is_lockShape;
}
if ( coauth_disable ) {

5
apps/spreadsheeteditor/main/app/view/Toolbar.js
View file

@ -104,7 +104,8 @@ define([
itemsDisabled: 'all-items-disabled',
wsLockText: 'worksheet-lock-text',
wsLockShape: 'worksheet-lock-shape',
wsLockFormat: 'worksheet-lock-format'
wsLockFormat: 'worksheet-lock-format',
wsLockFormatFill: 'worksheet-lock-format-fill'
};
SSE.Views.Toolbar = Common.UI.Mixtbar.extend(_.extend({
@ -563,7 +564,7 @@ define([
cls : 'btn-toolbar',
iconCls : 'toolbar__icon btn-paracolor',
split : true,
lock : [_set.selImage, _set.editCell, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect, _set.wsLockFormat],
lock : [_set.selImage, _set.editCell, _set.selSlicer, _set.coAuth, _set.coAuthText, _set.lostConnect, _set.wsLockFormatFill],
transparent: true,
menu: true,
dataHint: '1',