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

[DE mobile] Fix units in paragraph

Browse source
This commit is contained in:
Julia Svinareva 2019-04-25 13:55:59 +03:00
parent 265407d61f
commit c2013f48af
1 changed files with 59 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

74
apps/documenteditor/mobile/app/controller/edit/EditParagraph.js
View file

@ -144,7 +144,8 @@ define([
if (_paragraphProperty.get_Ind()===null || _paragraphProperty.get_Ind()===undefined) { if (_paragraphProperty.get_Ind()===null || _paragraphProperty.get_Ind()===undefined) {
_paragraphProperty.get_Ind().put_FirstLine(0); _paragraphProperty.get_Ind().put_FirstLine(0);
} }
$('#paragraph-spin-first-line .item-after label').text(_paragraphProperty.get_Ind().get_FirstLine() + ' ' + metricText);
$('#paragraph-spin-first-line .item-after label').text(Common.Utils.Metric.fnRecalcFromMM(_paragraphProperty.get_Ind().get_FirstLine()) + ' ' + metricText);
} }
if (_paragraphObject) { if (_paragraphObject) {
@ -232,50 +233,93 @@ define([
onDistanceBefore: function (e) { onDistanceBefore: function (e) {
var $button = $(e.currentTarget), var $button = $(e.currentTarget),
distance = _paragraphInfo.spaceBefore; distance = _paragraphInfo.spaceBefore,
step,
maxValue;
if (Common.Utils.Metric.getCurrentMetric() == Common.Utils.Metric.c_MetricUnits.pt) {
step = 1;
} else {
step = 0.01;
}
maxValue = Common.Utils.Metric.fnRecalcFromMM(558.8);
if ($button.hasClass('decrement')) { if ($button.hasClass('decrement')) {
distance = Math.max(-1, --distance); distance = Math.max(-1, distance - step);
} else { } else {
distance = Math.min(100, ++distance); distance = Math.min(maxValue, distance + step);
} }
var distanceFix = distance.toFixed(2);
_paragraphInfo.spaceBefore = distance; _paragraphInfo.spaceBefore = distance;
$('#paragraph-distance-before .item-after label').text(_paragraphInfo.spaceBefore < 0 ? 'Auto' : (_paragraphInfo.spaceBefore) + ' ' + metricText); $('#paragraph-distance-before .item-after label').text(_paragraphInfo.spaceBefore < 0 ? 'Auto' : distanceFix + ' ' + metricText);
this.api.put_LineSpacingBeforeAfter(0, (_paragraphInfo.spaceBefore < 0) ? -1 : Common.Utils.Metric.fnRecalcToMM(_paragraphInfo.spaceBefore)); this.api.put_LineSpacingBeforeAfter(0, (_paragraphInfo.spaceBefore < 0) ? -1 : Common.Utils.Metric.fnRecalcToMM(_paragraphInfo.spaceBefore));
}, },
onDistanceAfter: function (e) { onDistanceAfter: function (e) {
var $button = $(e.currentTarget), var $button = $(e.currentTarget),
distance = _paragraphInfo.spaceAfter; distance = _paragraphInfo.spaceAfter,
step,
maxValue;
if (Common.Utils.Metric.getCurrentMetric() == Common.Utils.Metric.c_MetricUnits.pt) {
step = 1;
} else {
step = 0.01;
}
maxValue = Common.Utils.Metric.fnRecalcFromMM(558.8);
if ($button.hasClass('decrement')) { if ($button.hasClass('decrement')) {
distance = Math.max(-1, --distance); distance = Math.max(-1, distance - step);
} else { } else {
distance = Math.min(100, ++distance); distance = Math.min(maxValue, distance + step);
} }
var distanceFix = distance.toFixed(2);
_paragraphInfo.spaceAfter = distance; _paragraphInfo.spaceAfter = distance;
$('#paragraph-distance-after .item-after label').text(_paragraphInfo.spaceAfter < 0 ? 'Auto' : (_paragraphInfo.spaceAfter) + ' ' + metricText); $('#paragraph-distance-after .item-after label').text(_paragraphInfo.spaceAfter < 0 ? 'Auto' : distanceFix + ' ' + metricText);
this.api.put_LineSpacingBeforeAfter(1, (_paragraphInfo.spaceAfter < 0) ? -1 : Common.Utils.Metric.fnRecalcToMM(_paragraphInfo.spaceAfter)); this.api.put_LineSpacingBeforeAfter(1, (_paragraphInfo.spaceAfter < 0) ? -1 : Common.Utils.Metric.fnRecalcToMM(_paragraphInfo.spaceAfter));
}, },
onSpinFirstLine: function(e) { onSpinFirstLine: function(e) {
var $button = $(e.currentTarget), var $button = $(e.currentTarget),
distance = _paragraphProperty.get_Ind().get_FirstLine(); distance = _paragraphProperty.get_Ind().get_FirstLine(),
step,
minValue,
maxValue;
if ($button.hasClass('decrement')) { distance = Common.Utils.Metric.fnRecalcFromMM(distance);
distance = Math.max(-999, --distance);
if (Common.Utils.Metric.getCurrentMetric() == Common.Utils.Metric.c_MetricUnits.pt) {
step = 1;
} else { } else {
distance = Math.min(999, ++distance); step = 0.1;
} }
_paragraphProperty.get_Ind().put_FirstLine(distance) minValue = Common.Utils.Metric.fnRecalcFromMM(-558.7);
maxValue = Common.Utils.Metric.fnRecalcFromMM(558.7);
if ($button.hasClass('decrement')) {
distance = Math.max(minValue, distance - step);
} else {
distance = Math.min(maxValue, distance + step);
}
var distanceFix = distance.toFixed(2);
$('#paragraph-spin-first-line .item-after label').text(distanceFix + ' ' + metricText);
distance = Common.Utils.Metric.fnRecalcToMM(distance);
_paragraphProperty.get_Ind().put_FirstLine(distance);
$('#paragraph-spin-first-line .item-after label').text(distance + ' ' + metricText);
this.api.paraApply(_paragraphProperty); this.api.paraApply(_paragraphProperty);
}, },