From 215a4c986f749a4a0c15de14317842043a0f232b Mon Sep 17 00:00:00 2001 From: Alexander Yuzhin Date: Thu, 16 Feb 2017 10:53:12 +0300 Subject: [PATCH] [DE mobile] Fix Bug 34066 --- apps/documenteditor/mobile/app/controller/edit/EditShape.js | 2 +- apps/documenteditor/mobile/locale/ru.json | 2 +- apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/apps/documenteditor/mobile/app/controller/edit/EditShape.js b/apps/documenteditor/mobile/app/controller/edit/EditShape.js index 21faa0816..b05e49507 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditShape.js @@ -224,7 +224,7 @@ define([ $('#edit-shape-bordersize .item-after').text(((borderType == Asc.c_oAscStrokeType.STROKE_NONE) ? 0 : borderSizeTransform.sizeByValue(borderSize)) + ' ' + _metricText); // Init style opacity - $('#edit-shape-effect input').val([shapeProperties.get_fill().transparent ? shapeProperties.get_fill().transparent / 2.55 : 100]); + $('#edit-shape-effect input').val([shapeProperties.get_fill().asc_getTransparent() ? shapeProperties.get_fill().asc_getTransparent() / 2.55 : 100]); $('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%"); paletteFillColor && paletteFillColor.on('select', _.bind(me.onFillColor, me)); diff --git a/apps/documenteditor/mobile/locale/ru.json b/apps/documenteditor/mobile/locale/ru.json index 0ceaf1e6e..fe5638007 100644 --- a/apps/documenteditor/mobile/locale/ru.json +++ b/apps/documenteditor/mobile/locale/ru.json @@ -3,7 +3,7 @@ "Common.UI.ThemeColorPalette.textThemeColors": "Цвета темы", "Common.Utils.Metric.txtCm": "см", "Common.Utils.Metric.txtPt": "пт", - "DE.Controllers.AddContainer.textImage": "Изображение", + "DE.Controllers.AddContainer.textImage": "Картинка", "DE.Controllers.AddContainer.textOther": "Другое", "DE.Controllers.AddContainer.textShape": "Фигура", "DE.Controllers.AddContainer.textTable": "Таблица", diff --git a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js index 3f5ef8478..1244d2436 100644 --- a/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/spreadsheeteditor/mobile/app/controller/edit/EditShape.js @@ -195,7 +195,7 @@ define([ // Effect // Init style opacity - $('#edit-shape-effect input').val([shapeProperties.get_fill().transparent ? shapeProperties.get_fill().transparent / 2.55 : 100]); + $('#edit-shape-effect input').val([shapeProperties.get_fill().asc_getTransparent() ? shapeProperties.get_fill().asc_getTransparent() / 2.55 : 100]); $('#edit-shape-effect .item-after').text($('#edit-shape-effect input').val() + ' ' + "%"); $('#edit-shape-effect input').single('change touchend', _.buffered(me.onOpacity, 100, me)); $('#edit-shape-effect input').single('input', _.bind(me.onOpacityChanging, me));