photowall/image-editor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

P5-1952 remove decimals on cm for the ruler

Browse Source
This commit is contained in:
Martin
2018-01-03 14:49:02 +01:00
parent a4d4ee01be
commit 90d6a3d2bb
3 changed files with 18 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
dist/image-editor.js
Vendored
+9 -2
View File
@@ -1248,6 +1248,8 @@ function ImageEditor(canvasId, args) {
hideRulers: 'Hide Ruler',
showFullscreen: 'Fullscreen',
exitFullscreen: 'Exit Fullscreen',
cm: 'cm',
inch: 'inch'
},
// Default dimensions
dimensions: {
@@ -1442,8 +1444,13 @@ function RulerHandler(viewport) {
if (axis === 'top') {
dim = viewport.getData().dim.height - dim;
}
ruler.setText(Math.round(dim * 100) / 100 + ' ' + viewport.getData().dim.units);
var units = viewport.getData().dim.units;
var value = Math.round(dim * 100) / 100;
if(units === 'cm') {
value = Math.round(value);
}
var label = viewport.canvas.__texts[units] || 'cm';
ruler.setText(value + ' ' + label);
}
var Event = {
src/ImageEditor.js
+2
View File
@@ -20,6 +20,8 @@ function ImageEditor(canvasId, args) {
hideRulers: 'Hide Ruler',
showFullscreen: 'Fullscreen',
exitFullscreen: 'Exit Fullscreen',
cm: 'cm',
inch: 'inch'
},
// Default dimensions
dimensions: {
src/RulerHandler.js
+7 -2
View File
@@ -20,8 +20,13 @@ function RulerHandler(viewport) {
if (axis === 'top') {
dim = viewport.getData().dim.height - dim;
}
ruler.setText(Math.round(dim * 100) / 100 + ' ' + viewport.getData().dim.units);
var units = viewport.getData().dim.units;
var value = Math.round(dim * 100) / 100;
if(units === 'cm') {
value = Math.round(value);
}
var label = viewport.canvas.__texts[units] || 'cm';
ruler.setText(value + ' ' + label);
}
var Event = {