From 0f043e0faaa476c20d5c12e8222153db491fdc33 Mon Sep 17 00:00:00 2001 From: Julia Svinareva Date: Thu, 11 Apr 2019 16:13:41 +0300 Subject: [PATCH] [de mobile] change metric text --- apps/documenteditor/mobile/app/controller/edit/EditChart.js | 4 +++- apps/documenteditor/mobile/app/controller/edit/EditImage.js | 1 + .../mobile/app/controller/edit/EditParagraph.js | 1 + apps/documenteditor/mobile/app/controller/edit/EditShape.js | 1 + apps/documenteditor/mobile/app/controller/edit/EditTable.js | 1 + 5 files changed, 7 insertions(+), 1 deletion(-) diff --git a/apps/documenteditor/mobile/app/controller/edit/EditChart.js b/apps/documenteditor/mobile/app/controller/edit/EditChart.js index 25db03196..553dbaf1b 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditChart.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditChart.js @@ -171,7 +171,7 @@ define([ initSettings: function (pageId) { var me = this; - + _metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()); if (_chartObject) { if (pageId == '#edit-chart-wrap') { me._initWrapView(); @@ -222,6 +222,7 @@ define([ paletteFillColor = me.getView('EditChart').paletteFillColor, paletteBorderColor = me.getView('EditChart').paletteBorderColor; + // Style var type = chartProperties.getType(); @@ -426,6 +427,7 @@ define([ properties = new Asc.asc_CImgProperty(), paddings = new Asc.asc_CPaddings(); + $('.chart-wrap .distance .item-after').text(value + ' ' + _metricText); value = Common.Utils.Metric.fnRecalcToMM(parseInt(value)); diff --git a/apps/documenteditor/mobile/app/controller/edit/EditImage.js b/apps/documenteditor/mobile/app/controller/edit/EditImage.js index 7098f8969..a8ad16c6e 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditImage.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditImage.js @@ -147,6 +147,7 @@ define([ me._initWrapView(); } } + _metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()); }, _initWrapView: function() { diff --git a/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js b/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js index efd160e66..3386260cc 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditParagraph.js @@ -129,6 +129,7 @@ define([ initSettings: function () { var me = this; + metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()); var selectedElements = me.api.getSelectedElements(); if (selectedElements && _.isArray(selectedElements)) { for (var i = selectedElements.length - 1; i >= 0; i--) { diff --git a/apps/documenteditor/mobile/app/controller/edit/EditShape.js b/apps/documenteditor/mobile/app/controller/edit/EditShape.js index f432ad22e..34eaa64e4 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditShape.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditShape.js @@ -181,6 +181,7 @@ define([ me.getView('EditShape').isShapeCanFill = _shapeObject.get_ShapeProperties().get_CanFill(); } } + _metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()); }, _initWrapView: function() { diff --git a/apps/documenteditor/mobile/app/controller/edit/EditTable.js b/apps/documenteditor/mobile/app/controller/edit/EditTable.js index 86b7dde72..ae90d74b1 100644 --- a/apps/documenteditor/mobile/app/controller/edit/EditTable.js +++ b/apps/documenteditor/mobile/app/controller/edit/EditTable.js @@ -185,6 +185,7 @@ define([ initSettings: function (pageId) { var me = this; + _metricText = Common.Utils.Metric.getMetricName(Common.Utils.Metric.getCurrentMetric()); if (_tableObject) { if (pageId == '#edit-table-wrap') {