From edfdecff5e0bb8ddf2d3b92dabfb29da707b0173 Mon Sep 17 00:00:00 2001 From: Julia Radzhabova Date: Fri, 16 Mar 2018 18:27:07 +0300 Subject: [PATCH] [DE] Enable outline levels when custom styles are selected --- apps/common/main/lib/component/MetricSpinner.js | 2 +- .../main/app/view/TableOfContentsSettings.js | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/apps/common/main/lib/component/MetricSpinner.js b/apps/common/main/lib/component/MetricSpinner.js index 916cd1b1f..354689eaf 100644 --- a/apps/common/main/lib/component/MetricSpinner.js +++ b/apps/common/main/lib/component/MetricSpinner.js @@ -448,7 +448,7 @@ define([ if (isNaN(val)) val = this.oldValue; } else { - val = me.options.defaultValue; + val = me.options.defaultValue - me.options.step; } me.setValue((this._add(val, me.options.step, (me.options.allowDecimal) ? 3 : 0) + ' ' + this.options.defaultUnit).trim(), suspend); } diff --git a/apps/documenteditor/main/app/view/TableOfContentsSettings.js b/apps/documenteditor/main/app/view/TableOfContentsSettings.js index a02efc4df..0527ffcb3 100644 --- a/apps/documenteditor/main/app/view/TableOfContentsSettings.js +++ b/apps/documenteditor/main/app/view/TableOfContentsSettings.js @@ -358,7 +358,8 @@ define([ var me = this, docStyles = this.api.asc_GetStylesArray(), - styles = []; + styles = [], + checkStyles = false; _.each(docStyles, function (style) { var name = style.get_Name(), level = me.api.asc_GetHeadingLevel(name); @@ -456,7 +457,7 @@ define([ } this.spnLevels.setValue(new_end>0 ? new_end : '', true); - this.spnLevels.setDisabled(disable_outlines || new_start>1 ); + checkStyles = (disable_outlines || new_start>1); } else { for (var i=this.startLevel; i<=this.endLevel; i++) { var rec = _.findWhere(styles, {headerLevel: i}); @@ -474,7 +475,7 @@ define([ return 0; }); this.stylesLevels.reset(styles); - if (this.spnLevels.isDisabled()) { + if (checkStyles) { this.radioStyles.setValue(true); this.stylesList.scroller.update({alwaysVisibleY: true}); var rec = this.stylesLevels.findWhere({checked: true}); @@ -557,7 +558,6 @@ define([ this.endLevel = new_end; this.spnLevels.setValue(new_end>0 ? new_end : '', true); - this.spnLevels.setDisabled(disable_outlines || new_start>1 ); this._needUpdateOutlineLevels = false; },