From 58ffa1aa69c3ffbc278d24bbae9677d02e59c27a Mon Sep 17 00:00:00 2001
From: Julia Radzhabova <Julia.Radzhabova@onlyoffice.com>
Date: Fri, 23 Aug 2019 15:19:11 +0300
Subject: [PATCH] [DE] Fix Bug 42530

---
 .../documenteditor/main/app/view/StyleTitleDialog.js | 12 +++++++-----
 apps/documenteditor/main/locale/en.json              |  1 +
 apps/documenteditor/main/locale/ru.json              |  1 +
 3 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/apps/documenteditor/main/app/view/StyleTitleDialog.js b/apps/documenteditor/main/app/view/StyleTitleDialog.js
index 9a0deabee5..238efe6895 100644
--- a/apps/documenteditor/main/app/view/StyleTitleDialog.js
+++ b/apps/documenteditor/main/app/view/StyleTitleDialog.js
@@ -71,6 +71,7 @@ define([
                 ].join('');
 
                 this.options.tpl = _.template(this.template)(this.options);
+                this.options.formats = this.options.formats || [];
 
                 Common.UI.Window.prototype.initialize.call(this, this.options);
             },
@@ -100,6 +101,7 @@ define([
 
             $window.find('.dlg-btn').on('click', _.bind(this.onBtnClick, this));
 
+            this.options.formats.unshift({value: -1, displayValue: this.txtSameAs});
             this.cmbNextStyle = new Common.UI.ComboBox({
                 el          : $('#id-dlg-style-next-par'),
                 style       : 'width: 100%;',
@@ -109,8 +111,7 @@ define([
                 data        : this.options.formats,
                 disabled    : (this.options.formats.length==0)
             });
-            if (this.options.formats.length>0)
-                this.cmbNextStyle.setValue(this.options.formats[0].value);
+            this.cmbNextStyle.setValue(-1);
         },
 
         show: function() {
@@ -128,8 +129,8 @@ define([
         },
 
         getNextStyle: function () {
-            var me = this;
-            return (me.options.formats.length>0) ? me.cmbNextStyle.getValue() : null;
+            var val = this.cmbNextStyle.getValue();
+            return (val!=-1) ? val : null;
         },
 
         onBtnClick: function(event) {
@@ -161,7 +162,8 @@ define([
         textHeader:           'Create New Style',
         txtEmpty:             'This field is required',
         txtNotEmpty:          'Field must not be empty',
-        textNextStyle:        'Next paragraph style'
+        textNextStyle:        'Next paragraph style',
+        txtSameAs:            'Same as created new style'
 
     }, DE.Views.StyleTitleDialog || {}))
 
diff --git a/apps/documenteditor/main/locale/en.json b/apps/documenteditor/main/locale/en.json
index 81107c5033..fe28eb861d 100644
--- a/apps/documenteditor/main/locale/en.json
+++ b/apps/documenteditor/main/locale/en.json
@@ -1873,6 +1873,7 @@
   "DE.Views.StyleTitleDialog.textTitle": "Title",
   "DE.Views.StyleTitleDialog.txtEmpty": "This field is required",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Field must not be empty",
+  "DE.Views.StyleTitleDialog.txtSameAs": "Same as created new style",
   "DE.Views.TableFormulaDialog.cancelButtonText": "Cancel",
   "DE.Views.TableFormulaDialog.okButtonText": "OK",
   "DE.Views.TableFormulaDialog.textBookmark": "Paste Bookmark",
diff --git a/apps/documenteditor/main/locale/ru.json b/apps/documenteditor/main/locale/ru.json
index 3d8d69c365..57a23f1b80 100644
--- a/apps/documenteditor/main/locale/ru.json
+++ b/apps/documenteditor/main/locale/ru.json
@@ -1873,6 +1873,7 @@
   "DE.Views.StyleTitleDialog.textTitle": "Название",
   "DE.Views.StyleTitleDialog.txtEmpty": "Это поле необходимо заполнить",
   "DE.Views.StyleTitleDialog.txtNotEmpty": "Поле не может быть пустым",
+  "DE.Views.StyleTitleDialog.txtSameAs": "Такой же, как создаваемый стиль",
   "DE.Views.TableFormulaDialog.cancelButtonText": "Отмена",
   "DE.Views.TableFormulaDialog.okButtonText": "ОК",
   "DE.Views.TableFormulaDialog.textBookmark": "Вставить закладку",