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

[DE] Fix Bug 44368

Browse source
This commit is contained in:
Julia Radzhabova 2020-01-30 16:00:36 +03:00 committed by Alexey Golubev
parent f8de67a58f
commit 9f7306c94b
2 changed files with 45 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
apps/documenteditor/main/app/controller/Toolbar.js
View file

@ -689,6 +689,12 @@ define([
if (this.mode.compatibleFeatures) { if (this.mode.compatibleFeatures) {
need_disable = need_disable || in_image; need_disable = need_disable || in_image;
} }
if (this.api.asc_IsContentControl()) {
var control_props = this.api.asc_GetContentControlProperties(),
spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
need_disable = need_disable || 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;
}
if ( this.btnsComment && this.btnsComment.length > 0 ) if ( this.btnsComment && this.btnsComment.length > 0 )
this.btnsComment.setDisabled(need_disable); this.btnsComment.setDisabled(need_disable);
}, },
@ -862,6 +868,11 @@ define([
if (this.mode.compatibleFeatures) { if (this.mode.compatibleFeatures) {
need_disable = need_disable || in_image; need_disable = need_disable || in_image;
} }
if (control_props) {
var spectype = control_props.get_SpecificType();
need_disable = need_disable || 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;
}
if ( this.btnsComment && this.btnsComment.length > 0 ) if ( this.btnsComment && this.btnsComment.length > 0 )
this.btnsComment.setDisabled(need_disable); this.btnsComment.setDisabled(need_disable);

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

@ -2014,6 +2014,12 @@ define([
if (me.mode.compatibleFeatures) if (me.mode.compatibleFeatures)
canComment = canComment && !isInShape; canComment = canComment && !isInShape;
if (me.api.asc_IsContentControl()) {
var control_props = me.api.asc_GetContentControlProperties(),
spectype = control_props ? control_props.get_SpecificType() : Asc.c_oAscContentControlSpecificType.None;
canComment = canComment && !(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);
}
menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled); menuViewUndo.setVisible(me.mode.canCoAuthoring && me.mode.canComments && !me._isDisabled);
menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled); menuViewUndo.setDisabled(!me.api.asc_getCanUndo() && !me._isDisabled);
@ -3080,13 +3086,6 @@ define([
menuAddHyperlinkTable.hyperProps.value = new Asc.CHyperlinkProperty(); menuAddHyperlinkTable.hyperProps.value = new Asc.CHyperlinkProperty();
menuAddHyperlinkTable.hyperProps.value.put_Text(text); menuAddHyperlinkTable.hyperProps.value.put_Text(text);
} }
/** coauthoring begin **/
// comments
var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
!value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
menuAddCommentTable.setVisible(me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments && !control_lock);
menuAddCommentTable.setDisabled(value.paraProps!==undefined && value.paraProps.locked===true);
/** coauthoring end **/
// review move // review move
var data = me.api.asc_GetRevisionsChangesStack(), var data = me.api.asc_GetRevisionsChangesStack(),
@ -3137,6 +3136,8 @@ define([
me.clearEquationMenu(false, 7); me.clearEquationMenu(false, 7);
menuEquationSeparatorInTable.setVisible(isEquation && eqlen>0); menuEquationSeparatorInTable.setVisible(isEquation && eqlen>0);
var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
!value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
var in_toc = me.api.asc_GetTableOfContentsPr(true), var in_toc = me.api.asc_GetTableOfContentsPr(true),
in_control = !in_toc && me.api.asc_IsContentControl(); in_control = !in_toc && me.api.asc_IsContentControl();
menuTableControl.setVisible(in_control); menuTableControl.setVisible(in_control);
@ -3145,9 +3146,19 @@ define([
lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked;
menuTableRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked); menuTableRemoveControl.setDisabled(lock_type==Asc.c_oAscSdtLockType.SdtContentLocked || lock_type==Asc.c_oAscSdtLockType.SdtLocked);
menuTableControlSettings.setVisible(me.mode.canEditContentControl); menuTableControlSettings.setVisible(me.mode.canEditContentControl);
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 ||
spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime;
} }
menuTableTOC.setVisible(in_toc); menuTableTOC.setVisible(in_toc);
/** coauthoring begin **/
// comments
menuAddCommentTable.setVisible(me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments && !control_lock);
menuAddCommentTable.setDisabled(value.paraProps!==undefined && value.paraProps.locked===true);
/** coauthoring end **/
var in_field = me.api.asc_GetCurrentComplexField(); var in_field = me.api.asc_GetCurrentComplexField();
menuTableRefreshField.setVisible(!!in_field); menuTableRefreshField.setVisible(!!in_field);
menuTableRefreshField.setDisabled(disabled); menuTableRefreshField.setDisabled(disabled);
@ -3659,17 +3670,6 @@ define([
if (me.api) { if (me.api) {
text = me.api.can_AddHyperlink(); text = me.api.can_AddHyperlink();
} }
/** coauthoring begin **/
var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
!value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
var isVisible = !isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments && !control_lock;
if (me.mode.compatibleFeatures)
isVisible = isVisible && !isInShape;
menuCommentSeparatorPara.setVisible(isVisible);
menuAddCommentPara.setVisible(isVisible);
menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
/** coauthoring end **/
menuAddHyperlinkPara.setVisible(value.hyperProps===undefined && text!==false); menuAddHyperlinkPara.setVisible(value.hyperProps===undefined && text!==false);
menuHyperlinkPara.setVisible(value.hyperProps!==undefined); menuHyperlinkPara.setVisible(value.hyperProps!==undefined);
menuHyperlinkParaSeparator.setVisible(menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible()); menuHyperlinkParaSeparator.setVisible(menuAddHyperlinkPara.isVisible() || menuHyperlinkPara.isVisible());
@ -3754,6 +3754,9 @@ define([
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));
} }
var control_lock = (value.paraProps) ? (!value.paraProps.value.can_DeleteBlockContentControl() || !value.paraProps.value.can_EditBlockContentControl() ||
!value.paraProps.value.can_DeleteInlineContentControl() || !value.paraProps.value.can_EditInlineContentControl()) : false;
var in_toc = me.api.asc_GetTableOfContentsPr(true), var in_toc = me.api.asc_GetTableOfContentsPr(true),
in_control = !in_toc && me.api.asc_IsContentControl() ; in_control = !in_toc && me.api.asc_IsContentControl() ;
menuParaRemoveControl.setVisible(in_control); menuParaRemoveControl.setVisible(in_control);
@ -3763,11 +3766,24 @@ define([
var control_props = me.api.asc_GetContentControlProperties(), var control_props = me.api.asc_GetContentControlProperties(),
lock_type = (control_props) ? control_props.get_Lock() : Asc.c_oAscSdtLockType.Unlocked; 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);
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 ||
spectype==Asc.c_oAscContentControlSpecificType.ComboBox || spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.DateTime;
} }
menuParaTOCSettings.setVisible(in_toc); menuParaTOCSettings.setVisible(in_toc);
menuParaTOCRefresh.setVisible(in_toc); menuParaTOCRefresh.setVisible(in_toc);
menuParaTOCSeparator.setVisible(in_toc); menuParaTOCSeparator.setVisible(in_toc);
/** coauthoring begin **/
var isVisible = !isInChart && me.api.can_AddQuotedComment()!==false && me.mode.canCoAuthoring && me.mode.canComments && !control_lock;
if (me.mode.compatibleFeatures)
isVisible = isVisible && !isInShape;
menuCommentSeparatorPara.setVisible(isVisible);
menuAddCommentPara.setVisible(isVisible);
menuAddCommentPara.setDisabled(value.paraProps && value.paraProps.locked === true);
/** coauthoring end **/
var in_field = me.api.asc_GetCurrentComplexField(); var in_field = me.api.asc_GetCurrentComplexField();
menuParaRefreshField.setVisible(!!in_field); menuParaRefreshField.setVisible(!!in_field);
menuParaRefreshField.setDisabled(disabled); menuParaRefreshField.setDisabled(disabled);