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

[DE] Fix bug 50062

Browse source
This commit is contained in:
JuliaSvinareva 2021-09-02 21:32:19 +03:00
parent d2ce8e60c4
commit 89e99a323f
2 changed files with 44 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/main/app/controller/Main.js
View file

@ -767,7 +767,7 @@ define([
app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormwMode); app.getController('Toolbar').DisableToolbar(disable, options.viewMode, options.reviewMode, options.fillFormwMode);
} }
if (options.documentHolder) { if (options.documentHolder) {
app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect); app.getController('DocumentHolder').getView().SetDisabled(disable, options.allowProtect, options.fillFormwMode);
} }
if (options.leftMenu) { if (options.leftMenu) {
if (options.leftMenu.disable) if (options.leftMenu.disable)

56
apps/documenteditor/main/app/view/DocumentHolder.js
View file

@ -223,7 +223,22 @@ define([
var showObjectMenu = function(event, docElement, eOpts){ var showObjectMenu = function(event, docElement, eOpts){
if (me.api){ if (me.api){
var obj = (me.mode.isEdit && !me._isDisabled) ? fillMenuProps(me.api.getSelectedElements()) : fillViewMenuProps(me.api.getSelectedElements()); var obj;
if (me.mode.isEdit && !me._isDisabled) {
obj = fillMenuProps(me.api.getSelectedElements());
} else if (me._fillFormwMode) {
var para = false,
elements = me.api.getSelectedElements();
for (var i = 0; i < elements.length; i++) {
var elType = elements[i].get_ObjectType();
if (Asc.c_oAscTypeSelectElement.Paragraph == elType) {
para = true;
}
}
obj = para ? fillMenuProps(elements) : fillViewMenuProps(elements);
} else {
obj = fillViewMenuProps(me.api.getSelectedElements());
}
if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts); if (obj) showPopupMenu(obj.menu_to_show, obj.menu_props, event, docElement, eOpts);
} }
}; };
@ -3723,6 +3738,10 @@ define([
value: 'remove' value: 'remove'
}).on('click', _.bind(me.onControlsSelect, me)); }).on('click', _.bind(me.onControlsSelect, me));
var menuParaCopyPasteSeparator = new Common.UI.MenuItem({
caption : '--'
});
var menuParaControlSettings = new Common.UI.MenuItem( var menuParaControlSettings = new Common.UI.MenuItem(
{ {
caption: me.textEditControls, caption: me.textEditControls,
@ -3847,9 +3866,10 @@ define([
me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270); me.menuParagraphDirect270.setChecked(dir == Asc.c_oAscVertDrawingText.vert270);
} }
menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart); menuParagraphAdvanced.isChart = (value.imgProps && value.imgProps.isChart);
menuParagraphBreakBefore.setVisible(!isInShape && !isInChart && !isEquation); menuParagraphAdvanced.setVisible(!me._fillFormwMode);
menuParagraphKeepLines.setVisible(!isInShape && !isInChart && !isEquation); menuParagraphBreakBefore.setVisible(!me._fillFormwMode && !isInShape && !isInChart && !isEquation);
if (value.paraProps) { menuParagraphKeepLines.setVisible(!me._fillFormwMode && !isInShape && !isInChart && !isEquation);
if (value.paraProps && !me._fillFormwMode) {
menuParagraphBreakBefore.setChecked(value.paraProps.value.get_PageBreakBefore()); menuParagraphBreakBefore.setChecked(value.paraProps.value.get_PageBreakBefore());
menuParagraphKeepLines.setChecked(value.paraProps.value.get_KeepLines()); menuParagraphKeepLines.setChecked(value.paraProps.value.get_KeepLines());
} }
@ -3897,13 +3917,17 @@ define([
var cancopy = me.api && me.api.can_CopyCut(); var cancopy = me.api && me.api.can_CopyCut();
menuParaCopy.setDisabled(!cancopy); menuParaCopy.setDisabled(!cancopy);
menuParaCut.setVisible(true);
menuParaCut.setDisabled(disabled || !cancopy); menuParaCut.setDisabled(disabled || !cancopy);
menuParaPaste.setVisible(true);
menuParaPaste.setDisabled(disabled); menuParaPaste.setDisabled(disabled);
menuParaPrint.setVisible(me.mode.canPrint); menuParaPrint.setVisible(me.mode.canPrint);
menuParaPrint.setDisabled(!cancopy); menuParaPrint.setDisabled(!cancopy);
menuParaCopyPasteSeparator.setVisible(!me._fillFormwMode);
// spellCheck // spellCheck
var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false); var spell = (value.spellProps!==undefined && value.spellProps.value.get_Checked()===false && !me._fillFormwMode);
me.menuSpellPara.setVisible(spell); me.menuSpellPara.setVisible(spell);
menuSpellcheckParaSeparator.setVisible(spell); menuSpellcheckParaSeparator.setVisible(spell);
menuIgnoreSpellPara.setVisible(spell); menuIgnoreSpellPara.setVisible(spell);
@ -3941,9 +3965,9 @@ define([
if (frame_pr) if (frame_pr)
menuDropCapAdvanced.setIconCls(frame_pr.get_DropCap()===Asc.c_oAscDropCap.Drop ? 'menu__icon dropcap-intext' : 'menu__icon dropcap-inmargin'); menuDropCapAdvanced.setIconCls(frame_pr.get_DropCap()===Asc.c_oAscDropCap.Drop ? 'menu__icon dropcap-intext' : 'menu__icon dropcap-inmargin');
menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart); menuStyleSeparator.setVisible(me.mode.canEditStyles && !isInChart && !me._fillFormwMode);
menuStyle.setVisible(me.mode.canEditStyles && !isInChart); menuStyle.setVisible(me.mode.canEditStyles && !isInChart && !me._fillFormwMode);
if (me.mode.canEditStyles && !isInChart) { if (me.mode.canEditStyles && !isInChart && !me._fillFormwMode) {
me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName)); me.menuStyleUpdate.setCaption(me.updateStyleText.replace('%1', DE.getController('Main').translationTable[window.currentStyleName] || window.currentStyleName));
} }
@ -3954,9 +3978,9 @@ define([
in_control = !in_toc && me.api.asc_IsContentControl(), in_control = !in_toc && me.api.asc_IsContentControl(),
control_props = in_control ? me.api.asc_GetContentControlProperties() : null, control_props = in_control ? me.api.asc_GetContentControlProperties() : null,
is_form = control_props && control_props.get_FormPr(); is_form = control_props && control_props.get_FormPr();
menuParaRemoveControl.setVisible(in_control); menuParaRemoveControl.setVisible(in_control && !me._fillFormwMode);
menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form); menuParaControlSettings.setVisible(in_control && me.mode.canEditContentControl && !is_form && !me._fillFormwMode);
menuParaControlSeparator.setVisible(in_control); menuParaControlSeparator.setVisible(in_control && !me._fillFormwMode);
if (in_control) { if (in_control) {
var lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; var lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
menuParaRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); menuParaRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
@ -3965,6 +3989,11 @@ define([
var spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None; var spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
control_lock = control_lock || spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture || control_lock = control_lock || spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.Picture ||
spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime; spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime;
if (me._fillFormwMode && spectype !== Asc.c_oAscContentControlSpecificType.None) {
menuParaCut.setVisible(false);
menuParaPaste.setVisible(false);
}
} }
menuParaTOCSettings.setVisible(in_toc); menuParaTOCSettings.setVisible(in_toc);
menuParaTOCRefresh.setVisible(in_toc); menuParaTOCRefresh.setVisible(in_toc);
@ -4020,7 +4049,7 @@ define([
menuParaPrint, menuParaPrint,
menuEquationInsertCaptionSeparator, menuEquationInsertCaptionSeparator,
menuEquationInsertCaption, menuEquationInsertCaption,
{ caption: '--' }, menuParaCopyPasteSeparator,
menuEquationSeparator, menuEquationSeparator,
menuParaRemoveControl, menuParaRemoveControl,
menuParaControlSettings, menuParaControlSettings,
@ -4427,9 +4456,10 @@ define([
_.defer(function(){ me.cmpEl.focus(); }, 50); _.defer(function(){ me.cmpEl.focus(); }, 50);
}, },
SetDisabled: function(state, canProtect) { SetDisabled: function(state, canProtect, fillFormwMode) {
this._isDisabled = state; this._isDisabled = state;
this._canProtect = canProtect; this._canProtect = canProtect;
this._fillFormwMode = state ? fillFormwMode : false;
}, },
alignmentText : 'Alignment', alignmentText : 'Alignment',