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

[DE] Fix Bug 44173

Browse source
This commit is contained in:
Julia Radzhabova 2020-02-19 17:07:50 +03:00
parent 070bf4e682
commit f8781cdea1
3 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2341,6 +2341,7 @@ define([
var win = new DE.Views.ImageSettingsAdvanced({ var win = new DE.Views.ImageSettingsAdvanced({
imageProps : elValue, imageProps : elValue,
sizeOriginal: imgsizeOriginal, sizeOriginal: imgsizeOriginal,
api : me.api,
sectionProps: me.api.asc_GetSectionProps(), sectionProps: me.api.asc_GetSectionProps(),
handler : function(result, value) { handler : function(result, value) {
if (result == 'ok') { if (result == 'ok') {

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

@ -538,6 +538,7 @@ define([
{ {
imageProps: elValue, imageProps: elValue,
sizeOriginal: imgsizeOriginal, sizeOriginal: imgsizeOriginal,
api : me.api,
sectionProps: me.api.asc_GetSectionProps(), sectionProps: me.api.asc_GetSectionProps(),
handler: function(result, value) { handler: function(result, value) {
if (result == 'ok') { if (result == 'ok') {

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

@ -103,6 +103,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.sectionProps = this.options.sectionProps; this.sectionProps = this.options.sectionProps;
this.pageWidth = this.options.sectionProps ? this.options.sectionProps.get_W() : 210; this.pageWidth = this.options.sectionProps ? this.options.sectionProps.get_W() : 210;
this.pageHeight = this.options.sectionProps ? this.options.sectionProps.get_H() : 297; this.pageHeight = this.options.sectionProps ? this.options.sectionProps.get_H() : 297;
this.api = this.options.api;
this._changedProps = null; this._changedProps = null;
this._changedShapeProps = null; this._changedShapeProps = null;
}, },
@ -1300,9 +1301,11 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined); this.btnOriginalSize.setDisabled(props.get_ImageUrl()===null || props.get_ImageUrl()===undefined);
this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Shapes this.btnsCategory[5].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Shapes
this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Margins this.btnsCategory[6].setVisible(shapeprops!==null && !shapeprops.get_FromChart()); // Margins
this.btnsCategory[3].setDisabled(props.get_FromGroup()); // Wrapping
this.btnsCategory[2].setVisible(!chartprops && (pluginGuid === null || pluginGuid === undefined)); // Rotation this.btnsCategory[2].setVisible(!chartprops && (pluginGuid === null || pluginGuid === undefined)); // Rotation
var control_props = this.api && this.api.asc_IsContentControl() ? this.api.asc_GetContentControlProperties() : null;
this.btnsCategory[3].setDisabled(props.get_FromGroup() || !!control_props && (control_props.get_SpecificType()==Asc.c_oAscContentControlSpecificType.Picture)); // Wrapping
if (shapeprops) { if (shapeprops) {
this._objectType = Asc.c_oAscTypeSelectElement.Shape; this._objectType = Asc.c_oAscTypeSelectElement.Shape;
this._setShapeDefaults(shapeprops); this._setShapeDefaults(shapeprops);