From 7858abeca6eb7860e5952dc53e0f821faa2393f1 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Wed, 7 Feb 2018 19:44:18 +1300
Subject: [PATCH] Improved copy/cut/paste

---
 sources/scripts/dotgrid.js | 32 ++++++++++++++++++++++++--------
 sources/scripts/tool.js    | 10 ++++++----
 2 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/sources/scripts/dotgrid.js b/sources/scripts/dotgrid.js
index 2562034..a27674b 100644
--- a/sources/scripts/dotgrid.js
+++ b/sources/scripts/dotgrid.js
@@ -130,6 +130,7 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
     this.controller.add("default","File","Save",() => { dotgrid.save(); },"CmdOrCtrl+S");
 
     this.controller.add("default","Edit","Copy",() => { document.execCommand('copy'); },"CmdOrCtrl+C");
+    this.controller.add("default","Edit","Cut",() => { document.execCommand('cut'); },"CmdOrCtrl+X");
     this.controller.add("default","Edit","Paste",() => { document.execCommand('paste'); },"CmdOrCtrl+V");
     this.controller.add("default","Edit","Undo",() => { dotgrid.tool.undo(); },"CmdOrCtrl+Z");
     this.controller.add("default","Edit","Redo",() => { dotgrid.tool.redo(); },"CmdOrCtrl+Shift+Z");
@@ -167,6 +168,7 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
     document.addEventListener('contextmenu', function(e){ dotgrid.mouse_alt(e); }, false);
     document.addEventListener('mouseup', function(e){ dotgrid.mouse_up(e);}, false);
     document.addEventListener('copy', function(e){ dotgrid.copy(e); e.preventDefault(); }, false);
+    document.addEventListener('cut', function(e){ dotgrid.cut(e); e.preventDefault(); }, false);
     document.addEventListener('paste', function(e){ dotgrid.paste(e); e.preventDefault(); }, false);
 
     window.addEventListener('drop', dotgrid.drag);
@@ -481,21 +483,35 @@ function Dotgrid(width,height,grid_x,grid_y,block_x,block_y,thickness = 3,lineca
 
     var svg = dotgrid.svg_el.outerHTML;
 
-    e.clipboardData.setData('text/plain', dotgrid.tool.export());
+    e.clipboardData.setData('text/plain', dotgrid.tool.export(dotgrid.tool.layer()));
     e.clipboardData.setData('text/html', svg);
     e.clipboardData.setData('text/svg+xml', svg);
+
+    this.draw();
+  }
+
+  this.cut = function(e)
+  {
+    dotgrid.scale = 1
+    dotgrid.width = 300
+    dotgrid.height = 300
+    dotgrid.draw();
+
+    var svg = dotgrid.svg_el.outerHTML;
+
+    e.clipboardData.setData('text/plain', dotgrid.tool.export(dotgrid.tool.layer()));
+    e.clipboardData.setData('text/html', svg);
+    e.clipboardData.setData('text/svg+xml', svg);
+
+    dotgrid.tool.layers[dotgrid.tool.index] = [];
+
+    this.draw();
   }
 
   this.paste = function(e)
   {
     var data = e.clipboardData.getData("text/plain");
-    try {
-      data = JSON.parse(data.trim());
-      if (!data || !data.dotgrid) throw null;
-    } catch (err) {
-      return;
-    }
-
+    data = JSON.parse(data.trim());
     dotgrid.tool.import(data);
     this.draw();
   }
diff --git a/sources/scripts/tool.js b/sources/scripts/tool.js
index d215a10..e3ca831 100644
--- a/sources/scripts/tool.js
+++ b/sources/scripts/tool.js
@@ -170,14 +170,14 @@ function Tool()
     dotgrid.draw();    
   }
 
-  this.export = function()
+  this.export = function(target = this.layers)
   {
-    return JSON.stringify(this.layers, null, 2);
+    return JSON.stringify(copy(target), null, 2);
   }
 
-  this.import = function(layers)
+  this.import = function(layer)
   {
-    this.layers = layers;
+    this.layers[this.index] = this.layers[this.index].concat(layer)
     dotgrid.history.push(this.layers);
     this.clear();
     dotgrid.draw();
@@ -198,4 +198,6 @@ function Tool()
     dotgrid.draw();
     console.log(`layer:${this.index}`)
   }
+
+  function copy(data){ return data ? JSON.parse(JSON.stringify(data)) : []; }
 }
\ No newline at end of file