[SSE] Fix Bug 47492

This commit is contained in:
Julia Radzhabova 2020-11-21 14:26:36 +03:00
parent cac7d741d7
commit d194dd6a10

View file

@ -341,7 +341,7 @@ define([
initVertAxisPage: function () { initVertAxisPage: function () {
var me = this, var me = this,
$vertAxisPage = $('.page[data-page=edit-chart-vertical-axis]'), $vertAxisPage = $('.page[data-page=edit-chart-vertical-axis]'),
chartProperty = me.api.asc_getChartObject(), chartProperty = me.api.asc_getChartObject(true),
verAxisProps = chartProperty.getVertAxisProps(), verAxisProps = chartProperty.getVertAxisProps(),
axisProps = (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartProperty.getHorAxisProps(); axisProps = (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartProperty.getHorAxisProps();
@ -440,7 +440,7 @@ define([
initHorAxisPage: function () { initHorAxisPage: function () {
var me = this, var me = this,
$horAxisPage = $('.page[data-page=edit-chart-horizontal-axis]'), $horAxisPage = $('.page[data-page=edit-chart-horizontal-axis]'),
chartProperty = me.api.asc_getChartObject(), chartProperty = me.api.asc_getChartObject(true),
horAxisProps = chartProperty.getHorAxisProps(), horAxisProps = chartProperty.getHorAxisProps(),
axisProps = (horAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartProperty.getVertAxisProps() : horAxisProps; axisProps = (horAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartProperty.getVertAxisProps() : horAxisProps;
@ -940,14 +940,14 @@ define([
// Helpers // Helpers
_getVerticalAxisProp: function () { _getVerticalAxisProp: function () {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verAxisProps = chartObject.getVertAxisProps(); verAxisProps = chartObject.getVertAxisProps();
return (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartObject.getHorAxisProps(); return (verAxisProps.getAxisType() == Asc.c_oAscAxisType.val) ? verAxisProps : chartObject.getHorAxisProps();
}, },
_setVerticalAxisProp: function (axisProps) { _setVerticalAxisProp: function (axisProps) {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verAxisProps = chartObject.getVertAxisProps(); verAxisProps = chartObject.getVertAxisProps();
if (!_.isUndefined(chartObject)) { if (!_.isUndefined(chartObject)) {
@ -957,14 +957,14 @@ define([
}, },
_getHorizontalAxisProp: function () { _getHorizontalAxisProp: function () {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verHorProps = chartObject.getHorAxisProps(); verHorProps = chartObject.getHorAxisProps();
return (verHorProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartObject.getVertAxisProps() : verHorProps; return (verHorProps.getAxisType() == Asc.c_oAscAxisType.val) ? chartObject.getVertAxisProps() : verHorProps;
}, },
_setHorizontalAxisProp: function (axisProps) { _setHorizontalAxisProp: function (axisProps) {
var chartObject = this.api.asc_getChartObject(), var chartObject = this.api.asc_getChartObject(true),
verAxisProps = chartObject.getHorAxisProps(); verAxisProps = chartObject.getHorAxisProps();
if (!_.isUndefined(chartObject)) { if (!_.isUndefined(chartObject)) {
@ -975,7 +975,7 @@ define([
_setLayoutProperty: function (propertyMethod, e) { _setLayoutProperty: function (propertyMethod, e) {
var value = $(e.currentTarget).val(), var value = $(e.currentTarget).val(),
chartObject = this.api.asc_getChartObject(); chartObject = this.api.asc_getChartObject(true);
if (!_.isUndefined(chartObject) && value && value.length > 0) { if (!_.isUndefined(chartObject) && value && value.length > 0) {
var intValue = parseInt(value); var intValue = parseInt(value);