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

Merge pull request #1373 from ONLYOFFICE/fix/bugfix

Browse source 
Fix/bugfix
This commit is contained in:
Julia Radzhabova 2021-12-01 23:49:59 +03:00 committed by GitHub
parent 07d626f6a1 45e2307939
commit e72f0b5ab1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
9 changed files with 22 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
apps/documenteditor/main/app/controller/PageLayout.js
View file

@ -148,7 +148,8 @@ define([
disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; disable.align = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
disable.group = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked; disable.group = islocked || wrapping == Asc.c_oAscWrapStyle2.Inline || content_locked;
disable.arrange = (wrapping == Asc.c_oAscWrapStyle2.Inline) && !props.get_FromGroup() || content_locked; disable.arrange = (wrapping == Asc.c_oAscWrapStyle2.Inline) && !props.get_FromGroup() || content_locked;
disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked || (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture); disable.wrapping = islocked || props.get_FromGroup() || (notflow && !me.api.CanChangeWrapPolygon()) || content_locked ||
(!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture && !control_props.get_FormPr());
if ( !disable.group ) { if ( !disable.group ) {
if (me.api.CanGroup() || me.api.CanUnGroup()) { if (me.api.CanGroup() || me.api.CanUnGroup()) {

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

@ -2676,7 +2676,7 @@ define([
} }
me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled()) || me.menuImageWrap.setDisabled(islocked || value.imgProps.value.get_FromGroup() || (notflow && menuWrapPolygon.isDisabled()) ||
(!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); (!!control_props && control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture && !control_props.get_FormPr()));
var cancopy = me.api && me.api.can_CopyCut(); var cancopy = me.api && me.api.can_CopyCut();
menuImgCopy.setDisabled(!cancopy); menuImgCopy.setDisabled(!cancopy);

5
apps/documenteditor/main/app/view/FileMenuPanels.js
View file

@ -407,7 +407,10 @@ define([
{ value: 120, displayValue: "120%" }, { value: 120, displayValue: "120%" },
{ value: 150, displayValue: "150%" }, { value: 150, displayValue: "150%" },
{ value: 175, displayValue: "175%" }, { value: 175, displayValue: "175%" },
{ value: 200, displayValue: "200%" } { value: 200, displayValue: "200%" },
{ value: 300, displayValue: "300%" },
{ value: 400, displayValue: "400%" },
{ value: 500, displayValue: "500%" }
], ],
dataHint: '2', dataHint: '2',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',

2
apps/documenteditor/main/app/view/ImageSettings.js
View file

@ -338,7 +338,7 @@ define([
value = props.get_CanBeFlow() && !this._locked; value = props.get_CanBeFlow() && !this._locked;
var fromgroup = props.get_FromGroup() || this._locked; var fromgroup = props.get_FromGroup() || this._locked;
var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null, var control_props = this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null,
isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) || this._locked; isPictureControl = !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) && !control_props.get_FormPr() || this._locked;
if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup || this._state.isPictureControl!==isPictureControl) { if (this._state.CanBeFlow!==value || this._state.FromGroup!==fromgroup || this._state.isPictureControl!==isPictureControl) {
this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl); this.cmbWrapType.setDisabled(!value || fromgroup || isPictureControl);
this._state.CanBeFlow=value; this._state.CanBeFlow=value;

5
apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
View file

@ -1390,7 +1390,8 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
if (control_props) { if (control_props) {
var spectype = control_props.get_SpecificType(); var spectype = control_props.get_SpecificType();
fixed_size = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox || fixed_size = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox ||
spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None) && spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None ||
spectype==Asc.c_oAscContentControlSpecificType.Picture) &&
control_props.get_FormPr() && control_props.get_FormPr().get_Fixed(); control_props.get_FormPr() && control_props.get_FormPr().get_Fixed();
} }
@ -1400,7 +1401,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart() && !fixed_size); // Margins this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart() && !fixed_size); // Margins
this.btnsCategory[7].setVisible(!fixed_size); // Alt this.btnsCategory[7].setVisible(!fixed_size); // Alt
this.btnsCategory[2].setVisible(!chartprops && (pluginGuid === null || pluginGuid === undefined)); // Rotation this.btnsCategory[2].setVisible(!chartprops && (pluginGuid === null || pluginGuid === undefined)); // Rotation
this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); // Wrapping this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture) && !control_props.get_FormPr()); // Wrapping
if (shapeprops) { if (shapeprops) {
this._objectType = Asc.c_oAscTypeSelectElement.Shape; this._objectType = Asc.c_oAscTypeSelectElement.Shape;

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

@ -798,7 +798,8 @@ define([
if (control_props) { if (control_props) {
var spectype = control_props.get_SpecificType(); var spectype = control_props.get_SpecificType();
control_props = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox || control_props = (spectype==Asc.c_oAscContentControlSpecificType.CheckBox || spectype==Asc.c_oAscContentControlSpecificType.ComboBox ||
spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None) && spectype==Asc.c_oAscContentControlSpecificType.DropDownList || spectype==Asc.c_oAscContentControlSpecificType.None ||
spectype==Asc.c_oAscContentControlSpecificType.Picture) &&
control_props.get_FormPr() && control_props.get_FormPr().get_Fixed(); control_props.get_FormPr() && control_props.get_FormPr().get_Fixed();
} else } else
control_props = false; control_props = false;

1
apps/documenteditor/mobile/src/controller/Main.jsx
View file

@ -346,6 +346,7 @@ class MainController extends Component {
this.api.asc_setViewMode(!appOptions.isEdit && !appOptions.isRestrictedEdit); this.api.asc_setViewMode(!appOptions.isEdit && !appOptions.isRestrictedEdit);
appOptions.isRestrictedEdit && appOptions.canComments && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments); appOptions.isRestrictedEdit && appOptions.canComments && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyComments);
appOptions.isRestrictedEdit && appOptions.canFillForms && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms); appOptions.isRestrictedEdit && appOptions.canFillForms && this.api.asc_setRestriction(Asc.c_oAscRestrictionType.OnlyForms);
appOptions.isRestrictedEdit && appOptions.canFillForms && this.api.asc_SetHighlightRequiredFields(true);
// Set units // Set units
let value = LocalStorage.getItem('de-mobile-settings-unit'); let value = LocalStorage.getItem('de-mobile-settings-unit');

5
apps/presentationeditor/main/app/view/FileMenuPanels.js
View file

@ -315,7 +315,10 @@ define([
{ value: 120, displayValue: "120%" }, { value: 120, displayValue: "120%" },
{ value: 150, displayValue: "150%" }, { value: 150, displayValue: "150%" },
{ value: 175, displayValue: "175%" }, { value: 175, displayValue: "175%" },
{ value: 200, displayValue: "200%" } { value: 200, displayValue: "200%" },
{ value: 300, displayValue: "300%" },
{ value: 400, displayValue: "400%" },
{ value: 500, displayValue: "500%" }
], ],
dataHint: '2', dataHint: '2',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',

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

@ -887,7 +887,10 @@ define([
{ value: 120, displayValue: "120%" }, { value: 120, displayValue: "120%" },
{ value: 150, displayValue: "150%" }, { value: 150, displayValue: "150%" },
{ value: 175, displayValue: "175%" }, { value: 175, displayValue: "175%" },
{ value: 200, displayValue: "200%" } { value: 200, displayValue: "200%" },
{ value: 300, displayValue: "300%" },
{ value: 400, displayValue: "400%" },
{ value: 500, displayValue: "500%" }
], ],
dataHint : '3', dataHint : '3',
dataHintDirection: 'bottom', dataHintDirection: 'bottom',