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

Fix Bug 35415.

Browse source
This commit is contained in:
Julia Radzhabova 2017-08-04 14:24:30 +03:00
parent ceadc48c56
commit 6899a941ca
4 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -66,7 +66,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
{panelId: 'id-adv-shape-size', panelCaption: this.textSize}, {panelId: 'id-adv-shape-size', panelCaption: this.textSize},
{panelId: 'id-adv-image-wrap', panelCaption: this.textBtnWrap}, {panelId: 'id-adv-image-wrap', panelCaption: this.textBtnWrap},
{panelId: 'id-adv-image-position', panelCaption: this.textPosition}, {panelId: 'id-adv-image-position', panelCaption: this.textPosition},
{panelId: 'id-adv-image-shape', panelCaption: this.textShape}, {panelId: 'id-adv-image-shape', panelCaption: this.textWeightArrows},
{panelId: 'id-adv-image-margins', panelCaption: this.strMargins}, {panelId: 'id-adv-image-margins', panelCaption: this.strMargins},
{panelId: 'id-adv-image-alttext', panelCaption: this.textAlt} {panelId: 'id-adv-image-alttext', panelCaption: this.textAlt}
], ],
@ -1334,6 +1334,7 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
} }
this.btnsCategory[5].setDisabled(null === margins); // Margins this.btnsCategory[5].setDisabled(null === margins); // Margins
this.btnsCategory[4].setDisabled(shapeprops.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
} else { } else {
value = props.asc_getLockAspect(); value = props.asc_getLockAspect();
@ -2031,7 +2032,8 @@ define([ 'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
textAlt: 'Alternative Text', textAlt: 'Alternative Text',
textAltTitle: 'Title', textAltTitle: 'Title',
textAltDescription: 'Description', textAltDescription: 'Description',
textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.' textAltTip: 'The alternative text-based representation of the visual object information, which will be read to the people with vision or cognitive impairments to help them better understand what information there is in the image, autoshape, chart or table.',
textWeightArrows: 'Weights & Arrows'
}, DE.Views.ImageSettingsAdvanced || {})); }, DE.Views.ImageSettingsAdvanced || {}));
}); });

1
apps/documenteditor/main/locale/en.json
View file

@ -1115,6 +1115,7 @@
"DE.Views.ImageSettingsAdvanced.textTop": "Top", "DE.Views.ImageSettingsAdvanced.textTop": "Top",
"DE.Views.ImageSettingsAdvanced.textTopMargin": "Top Margin", "DE.Views.ImageSettingsAdvanced.textTopMargin": "Top Margin",
"DE.Views.ImageSettingsAdvanced.textVertical": "Vertical", "DE.Views.ImageSettingsAdvanced.textVertical": "Vertical",
"DE.Views.ImageSettingsAdvanced.textWeightArrows": "Weights & Arrows",
"DE.Views.ImageSettingsAdvanced.textWidth": "Width", "DE.Views.ImageSettingsAdvanced.textWidth": "Width",
"DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping Style", "DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping Style",
"DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind", "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind",

2
apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -538,6 +538,8 @@ define([ 'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
if (props ){ if (props ){
var stroke = props.get_stroke(); var stroke = props.get_stroke();
if (stroke) { if (stroke) {
this.btnsCategory[1].setDisabled(stroke.get_type() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
var value = stroke.get_linejoin(); var value = stroke.get_linejoin();
for (var i=0; i<this._arrJoinType.length; i++) { for (var i=0; i<this._arrJoinType.length; i++) {
if (value == this._arrJoinType[i].value) { if (value == this._arrJoinType[i].value) {

2
apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
View file

@ -571,6 +571,8 @@ define([ 'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
if (props ){ if (props ){
var stroke = props.asc_getStroke(); var stroke = props.asc_getStroke();
if (stroke) { if (stroke) {
this.btnsCategory[1].setDisabled(stroke.asc_getType() == Asc.c_oAscStrokeType.STROKE_NONE); // Weights & Arrows
var value = stroke.asc_getLinejoin(); var value = stroke.asc_getLinejoin();
for (var i=0; i<this._arrJoinType.length; i++) { for (var i=0; i<this._arrJoinType.length; i++) {
if (value == this._arrJoinType[i].value) { if (value == this._arrJoinType[i].value) {