From f13b5cd1437527d6aff758495c7567daa73eab8f Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Tue, 7 Mar 2017 16:29:19 +0300 Subject: [PATCH] [SE mobile] Fix bug 34149 --- apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js index 49835be36..14e829717 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditCell.js @@ -265,7 +265,7 @@ define([ initBorderStyle: function () { $('.page[data-page=edit-border-style] a[data-type]').single('click', _.bind(this.onBorderStyle, this)); - $('#edit-border-color .color-preview').css('background-color', '#' + _borderInfo.color); + $('#edit-border-color .color-preview').css('background-color', '#' + (_.isObject(_borderInfo.color) ? _borderInfo.color.color : _borderInfo.color)); $('#edit-border-size select').val(_borderInfo.width); $('#edit-border-size .item-after').text($('#edit-border-size select option[value=' +_borderInfo.width + ']').text());