From 6899a941cad2032b01adce8cb13c55056d78f4d8 Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 4 Aug 2017 14:24:30 +0300
Subject: [PATCH] Fix Bug 35415.

---
 apps/documenteditor/main/app/view/ImageSettingsAdvanced.js  | 6 ++++--
 apps/documenteditor/main/locale/en.json                     | 1 +
 .../main/app/view/ShapeSettingsAdvanced.js                  | 2 ++
 .../main/app/view/ShapeSettingsAdvanced.js                  | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
index fffc08013..080d8b8ea 100644
--- a/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
+++ b/apps/documenteditor/main/app/view/ImageSettingsAdvanced.js
@@ -66,7 +66,7 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
                     {panelId: 'id-adv-shape-size',       panelCaption: this.textSize},
                     {panelId: 'id-adv-image-wrap',       panelCaption: this.textBtnWrap},
                     {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-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[4].setDisabled(shapeprops.get_stroke().get_type() == Asc.c_oAscStrokeType.STROKE_NONE);   // Weights & Arrows
 
                 } else {
                     value = props.asc_getLockAspect();
@@ -2031,7 +2032,8 @@ define([    'text!documenteditor/main/app/template/ImageSettingsAdvanced.templat
         textAlt: 'Alternative Text',
         textAltTitle: 'Title',
         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 || {}));
 });
\ No newline at end of file
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 76aec422d..3d1feb290 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1115,6 +1115,7 @@
   "DE.Views.ImageSettingsAdvanced.textTop": "Top",
   "DE.Views.ImageSettingsAdvanced.textTopMargin": "Top Margin",
   "DE.Views.ImageSettingsAdvanced.textVertical": "Vertical",
+  "DE.Views.ImageSettingsAdvanced.textWeightArrows": "Weights & Arrows",
   "DE.Views.ImageSettingsAdvanced.textWidth": "Width",
   "DE.Views.ImageSettingsAdvanced.textWrap": "Wrapping Style",
   "DE.Views.ImageSettingsAdvanced.textWrapBehindTooltip": "Behind",
diff --git a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
index a49e48575..b1144788e 100644
--- a/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/presentationeditor/main/app/view/ShapeSettingsAdvanced.js
@@ -538,6 +538,8 @@ define([    'text!presentationeditor/main/app/template/ShapeSettingsAdvanced.tem
             if (props ){
                 var stroke = props.get_stroke();
                 if (stroke) {
+                    this.btnsCategory[1].setDisabled(stroke.get_type() == Asc.c_oAscStrokeType.STROKE_NONE);   // Weights & Arrows
+
                     var value = stroke.get_linejoin();
                     for (var i=0; i<this._arrJoinType.length; i++) {
                         if (value == this._arrJoinType[i].value) {
diff --git a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
index 640458a70..50d4925ec 100644
--- a/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
+++ b/apps/spreadsheeteditor/main/app/view/ShapeSettingsAdvanced.js
@@ -571,6 +571,8 @@ define([    'text!spreadsheeteditor/main/app/template/ShapeSettingsAdvanced.temp
             if (props ){
                 var stroke = props.asc_getStroke();
                 if (stroke) {
+                    this.btnsCategory[1].setDisabled(stroke.asc_getType() == Asc.c_oAscStrokeType.STROKE_NONE);   // Weights & Arrows
+
                     var value = stroke.asc_getLinejoin();
                     for (var i=0; i<this._arrJoinType.length; i++) {
                         if (value == this._arrJoinType[i].value) {