diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js index 5c016a638..84639f70a 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js @@ -182,7 +182,7 @@ define([ initFontsPage: function () { var me = this, - displaySize = _fontInfo.size; + displaySize = _fontInfo.asc_getFontSize(); _.isUndefined(displaySize) ? displaySize = this.textAuto : displaySize = displaySize + ' ' + this.textPt; @@ -196,7 +196,7 @@ define([ initTextColorPage: function () { var me = this, - color = me._sdkToThemeColor(_fontInfo.color), + color = me._sdkToThemeColor(_fontInfo.asc_getFontColor()), palette = me.getView('EditText').paletteTextColor; if (palette) { @@ -210,7 +210,7 @@ define([ onFontSize: function (e) { var me = this, $button = $(e.currentTarget), - fontSize = _fontInfo.size; + fontSize = _fontInfo.asc_getFontSize(); if ($button.hasClass('decrement')) { _.isUndefined(fontSize) ? me.api.asc_decreaseFontSize() : fontSize = Math.max(1, --fontSize); diff --git a/apps/spreadsheeteditor/mobile/app/view/edit/EditText.js b/apps/spreadsheeteditor/mobile/app/view/edit/EditText.js index 9c7c598c0..230d996a9 100644 --- a/apps/spreadsheeteditor/mobile/app/view/edit/EditText.js +++ b/apps/spreadsheeteditor/mobile/app/view/edit/EditText.js @@ -138,8 +138,7 @@ define([ this.showPage(page, true); this.paletteTextColor = new Common.UI.ThemeColorPalette({ - el: $('.page[data-page=edit-text-color] .page-content'), - transparent: true + el: $('.page[data-page=edit-text-color] .page-content') }); this.paletteTextColor.on('customcolor', function () { me.showCustomTextColor(); @@ -202,7 +201,7 @@ define([ template: $template.html(), onItemsAfterInsert: function (list, fragment) { var fontInfo = SSE.getController('EditText').getFontInfo(); - $('#font-list input[name=font-name]').val([fontInfo.name]); + $('#font-list input[name=font-name]').val([fontInfo.asc_getFontName() || '']); $('#font-list li').single('click', _.buffered(function (e) { me.fireEvent('font:click', [me, e]);