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

[SSE mobile] Fix text settings

Browse source
This commit is contained in:
Julia Radzhabova 2020-11-27 14:45:04 +03:00
parent bcbf2d1ba0
commit 49f1896854
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/spreadsheeteditor/mobile/app/controller/edit/EditText.js
View file

@ -182,7 +182,7 @@ define([
initFontsPage: function () { initFontsPage: function () {
var me = this, var me = this,
displaySize = _fontInfo.size; displaySize = _fontInfo.asc_getFontSize();
_.isUndefined(displaySize) ? displaySize = this.textAuto : displaySize = displaySize + ' ' + this.textPt; _.isUndefined(displaySize) ? displaySize = this.textAuto : displaySize = displaySize + ' ' + this.textPt;
@ -196,7 +196,7 @@ define([
initTextColorPage: function () { initTextColorPage: function () {
var me = this, var me = this,
color = me._sdkToThemeColor(_fontInfo.color), color = me._sdkToThemeColor(_fontInfo.asc_getFontColor()),
palette = me.getView('EditText').paletteTextColor; palette = me.getView('EditText').paletteTextColor;
if (palette) { if (palette) {
@ -210,7 +210,7 @@ define([
onFontSize: function (e) { onFontSize: function (e) {
var me = this, var me = this,
$button = $(e.currentTarget), $button = $(e.currentTarget),
fontSize = _fontInfo.size; fontSize = _fontInfo.asc_getFontSize();
if ($button.hasClass('decrement')) { if ($button.hasClass('decrement')) {
_.isUndefined(fontSize) ? me.api.asc_decreaseFontSize() : fontSize = Math.max(1, --fontSize); _.isUndefined(fontSize) ? me.api.asc_decreaseFontSize() : fontSize = Math.max(1, --fontSize);

5
apps/spreadsheeteditor/mobile/app/view/edit/EditText.js
View file

@ -138,8 +138,7 @@ define([
this.showPage(page, true); this.showPage(page, true);
this.paletteTextColor = new Common.UI.ThemeColorPalette({ this.paletteTextColor = new Common.UI.ThemeColorPalette({
el: $('.page[data-page=edit-text-color] .page-content'), el: $('.page[data-page=edit-text-color] .page-content')
transparent: true
}); });
this.paletteTextColor.on('customcolor', function () { this.paletteTextColor.on('customcolor', function () {
me.showCustomTextColor(); me.showCustomTextColor();
@ -202,7 +201,7 @@ define([
template: $template.html(), template: $template.html(),
onItemsAfterInsert: function (list, fragment) { onItemsAfterInsert: function (list, fragment) {
var fontInfo = SSE.getController('EditText').getFontInfo(); 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) { $('#font-list li').single('click', _.buffered(function (e) {
me.fireEvent('font:click', [me, e]); me.fireEvent('font:click', [me, e]);