Lea/web-apps
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge pull request #844 from ONLYOFFICE/fix/bugfix

Browse source 
Fix Bug 50044
This commit is contained in:
Julia Radzhabova 2021-04-27 17:35:13 +03:00 committed by GitHub
parent 2a75e05bfa dce1a7a54c
commit 898c5f8cfa
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
apps/documenteditor/mobile/app/controller/edit/EditChart.js
View file

@ -489,7 +489,7 @@ define([
onBorderColor: function (palette, color) { onBorderColor: function (palette, color) {
var me = this, 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))); $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderColor = color; _borderColor = color;

5
apps/documenteditor/mobile/app/controller/edit/EditShape.js
View file

@ -449,8 +449,7 @@ define([
}, },
onFillColor: function(palette, color) { onFillColor: function(palette, color) {
var me = this, var me = this;
currentShape = _shapeObject.get_ShapeProperties();
if (me.api) { if (me.api) {
var image = new Asc.asc_CImgProperty(), var image = new Asc.asc_CImgProperty(),
@ -475,7 +474,7 @@ define([
onBorderColor: function (palette, color) { onBorderColor: function (palette, color) {
var me = this, 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))); $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderColor = color; _borderColor = color;

2
apps/spreadsheeteditor/mobile/app/controller/edit/EditChart.js
View file

@ -626,7 +626,7 @@ define([
onBorderColor: function (palette, color) { onBorderColor: function (palette, color) {
var me = this, 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))); $('#edit-chart-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderInfo.color = color; _borderInfo.color = color;

5
apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js
View file

@ -301,8 +301,7 @@ define([
}, },
onFillColor: function(palette, color) { onFillColor: function(palette, color) {
var me = this, var me = this;
currentShape = _shapeObject.get_ShapeProperties();
if (me.api) { if (me.api) {
var image = new Asc.asc_CImgProperty(), var image = new Asc.asc_CImgProperty(),
@ -327,7 +326,7 @@ define([
onBorderColor: function (palette, color) { onBorderColor: function (palette, color) {
var me = this, 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))); $('#edit-shape-bordercolor .color-preview').css('background-color', ('transparent' == color) ? color : ('#' + (_.isObject(color) ? color.color : color)));
_borderInfo.color = color; _borderInfo.color = color;