Bug 40362, Bug 43365, Bug 42936

This commit is contained in:
Julia Radzhabova 2019-12-20 16:18:17 +03:00
parent f9149c6b9e
commit e7cec07aad

View file

@ -743,10 +743,10 @@ define([
if (sh) if (sh)
this.onParagraphColor(sh); this.onParagraphColor(sh);
var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : true, var rich_del_lock = (frame_pr) ? !frame_pr.can_DeleteBlockContentControl() : false,
rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : true, rich_edit_lock = (frame_pr) ? !frame_pr.can_EditBlockContentControl() : false,
plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : true, plain_del_lock = (frame_pr) ? !frame_pr.can_DeleteInlineContentControl() : false,
plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : true; plain_edit_lock = (frame_pr) ? !frame_pr.can_EditInlineContentControl() : false;
var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock; var need_disable = paragraph_locked || header_locked || rich_edit_lock || plain_edit_lock;
if (this._state.prcontrolsdisable != need_disable) { if (this._state.prcontrolsdisable != need_disable) {