diff --git a/apps/documenteditor/mobile/app/controller/edit/EditChart.js b/apps/documenteditor/mobile/app/controller/edit/EditChart.js index bf18a3fcc..90b5fddd2 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditChart.js @@ -489,7 +489,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderColor = color; diff --git a/apps/documenteditor/mobile/app/controller/edit/EditShape.js b/apps/documenteditor/mobile/app/controller/edit/EditShape.js index 171396166..996c13543 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditShape.js @@ -449,8 +449,7 @@ define([ }, onFillColor: function(palette, color) { - var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + var me = this; if (me.api) { var image = new Asc.asc_CImgProperty(), @@ -475,7 +474,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderColor = color; diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js index 53872aa79..e81b34ca7 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js @@ -626,7 +626,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderInfo.color = color; diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js index b60c14f71..83e225529 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js @@ -301,8 +301,7 @@ define([ }, onFillColor: function(palette, color) { - var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + var me = this; if (me.api) { var image = new Asc.asc_CImgProperty(), @@ -327,7 +326,7 @@ define([ onBorderColor: function (palette, color) { var me = this, - currentShape = _shapeObject.get_ShapeProperties(); + currentShape = _shapeObject ? _shapeObject.get_ShapeProperties() : null; $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color))); _borderInfo.color = color;