From 0e90aec8eacd9bc2d850ecca92582ded74c06f78 Mon Sep 17 00:00:00 2001 From: Devine Lu Linvega Date: Tue, 8 May 2018 13:32:06 +1200 Subject: [PATCH] Minor change --- desktop/sources/scripts/dotgrid.js | 19 +++++++++++++++++-- desktop/sources/scripts/tool.js | 5 ++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/desktop/sources/scripts/dotgrid.js b/desktop/sources/scripts/dotgrid.js index 67c274b..6be48fc 100644 --- a/desktop/sources/scripts/dotgrid.js +++ b/desktop/sources/scripts/dotgrid.js @@ -487,8 +487,11 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) this.paste = function(e) { var data = e.clipboardData.getData("text/source"); - data = JSON.parse(data.trim()); - dotgrid.tool.import(data); + if(is_json(data)){ + data = JSON.parse(data.trim()); + dotgrid.tool.import(data); + } + this.draw(); } @@ -513,6 +516,18 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y) return {x:x,y:y}; } + + function is_json(text) + { + try{ + JSON.parse(text); + return true; + } + catch (error){ + return false; + } + } + function pos_is_equal(a,b){ return a && b && a.x == b.x && a.y == b.y } function clamp(v, min, max) { return v < min ? min : v > max ? max : v; } } diff --git a/desktop/sources/scripts/tool.js b/desktop/sources/scripts/tool.js index fc0c4d8..901e5a3 100644 --- a/desktop/sources/scripts/tool.js +++ b/desktop/sources/scripts/tool.js @@ -265,7 +265,7 @@ function Tool() return html } - this.mirror_mod = function(vertex,angle,mirror_x = false,mirror_y = false) + this.mirror_mod = function(vertex,angle = 0,mirror_x = false,mirror_y = false) { if(!vertex){ return null; } @@ -275,6 +275,9 @@ function Tool() if(mirror_y == true){ return {x:vertex.x,y:(dotgrid.tool.settings.size.height - vertex.y)+(dotgrid.height/2)} } + if(angle == 0){ + return vertex; + } return rotate_point(vertex.x,vertex.y,dotgrid.tool.settings.size.width/2,dotgrid.tool.settings.size.height/2,angle) }