From 5af3e9eb30166e5d6175bd0846ec8e125ac85afb Mon Sep 17 00:00:00 2001
From: Mark MacKay <mark@duopixel.com>
Date: Mon, 22 Feb 2021 12:07:04 -0600
Subject: [PATCH] changes

---
 src/index.html     |  8 +++----
 src/js/PaintBox.js | 23 +-------------------
 src/js/Zoom.js     |  7 ++++++-
 src/js/editor.js   | 52 +++++++++++++++++++++++++++++++++++++++++++++-
 4 files changed, 62 insertions(+), 28 deletions(-)

diff --git a/src/index.html b/src/index.html
index 4d1593e..7f1422b 100644
--- a/src/index.html
+++ b/src/index.html
@@ -69,17 +69,17 @@
   <div class="menu">
     <div class="menu_title">File</div>
     <div class="menu_list" id="file_menu"> 
-      <div id="tool_clear" class="menu_item">New Document</div>
+      <div data-action="clear" id="tool_clear" class="menu_item">New Document</div>
       
-      <div id="tool_open" class="menu_item">
+      <div data-action="clear" id="tool_open" class="menu_item">
         Open SVG...</div>
       <input type="file" accept="image/svg+xml" />
       
       <div id="tool_import" class="menu_item">
         Place Image... <span class="shortcut">⌘K</span></div>
         <input type="file" accept="image/*" />
-      <div id="tool_save" class="menu_item">Save Image... <span class="shortcut">⌘S</span></div>
-      <div id="tool_export" class="menu_item">Export as PNG</div>
+      <div data-action="save" id="tool_save" class="menu_item">Save Image... <span class="shortcut">⌘S</span></div>
+      <div data-action="export" id="tool_export" class="menu_item">Export as PNG</div>
     </div>
   </div>
 
diff --git a/src/js/PaintBox.js b/src/js/PaintBox.js
index 1e71ff5..217649c 100644
--- a/src/js/PaintBox.js
+++ b/src/js/PaintBox.js
@@ -76,31 +76,10 @@ MD.PaintBox = function(container, type){
     editor.paintBox.stroke.setPaint(fill, true);
   });
 
-  function createBackground(fill) {
-    const res = svgCanvas.getResolution();
-    svgCanvas.createLayer("background");
-    cur_shape = svgCanvas.addSvgElementFromJson({
-      "element": "rect",
-      "attr": {
-        "x": -1,
-        "y": -1,
-        "width": res.w+2,
-        "height": res.h+2,
-        "stroke": "none",
-        "id": "canvas_background",
-        "opacity": 1,
-        "fill": fill || "#fff",
-        "style": "pointer-events:none"
-      }
-    });
-    svgCanvas.setCurrentLayer("Layer 1")
-    svgCanvas.setCurrentLayerPosition("1")
-  }
-
   var background = document.getElementById("canvas_background");
   
   // create a new layer background if it doesn't exist
-  if (!document.getElementById('canvas_background')) createBackground();
+  if (!document.getElementById('canvas_background')) editor.createBackground();
   var fill = document.getElementById('canvas_background').getAttribute("fill");
 
   
diff --git a/src/js/Zoom.js b/src/js/Zoom.js
index 9a9d42e..6cd0025 100644
--- a/src/js/Zoom.js
+++ b/src/js/Zoom.js
@@ -90,6 +90,11 @@ MD.Zoom = function(){
     editor.canvas.update(true);
   };
 
-  this.multiply = multiply
+  function reset(){
+    multiply(1);
+  }
+
+  this.multiply = multiply;
+  this.reset = reset;
   this.changed = changed;
 }
\ No newline at end of file
diff --git a/src/js/editor.js b/src/js/editor.js
index 47308a0..1edba14 100644
--- a/src/js/editor.js
+++ b/src/js/editor.js
@@ -7,6 +7,23 @@ MD.Editor = function(){
   const workarea = document.getElementById("workarea");
   _self.selected = [];
 
+  function clear(){
+    var dims = state.get("canvasSize");
+    $.confirm("<strong>Do you want to clear the drawing?</strong>\nThis will also erase your undo history", function(ok) {
+      if(!ok) return;
+      state.set("canvasMode", "select")
+      svgCanvas.clear();
+      svgCanvas.setResolution(dims[0], dims[1]);
+      editor.canvas.update();
+      _self.createBackground();
+      editor.zoom.reset();
+      editor.panel.updateContextPanel();
+      editor.paintBox.fill.prep();
+      editor.paintBox.stroke.prep();
+      svgCanvas.runExtensions('onNewDocument');
+    });
+  }
+
   function save(){
     _self.menu.flash($('#file_menu'));
     svgCanvas.save();
@@ -89,7 +106,7 @@ MD.Editor = function(){
     svgCanvas.setMode("pathedit")
     path.toEditMode(elems[0]);
     svgCanvas.clearSelection();
-    updateContextPanel();
+    editor.panel.updateContextPanel();
   }
 
   function reorientPath(){
@@ -301,6 +318,27 @@ MD.Editor = function(){
     editor.panel.updateContextPanel();
   }
 
+  function createBackground(fill) {
+    const res = svgCanvas.getResolution();
+    svgCanvas.createLayer("background");
+    cur_shape = svgCanvas.addSvgElementFromJson({
+      "element": "rect",
+      "attr": {
+        "x": -1,
+        "y": -1,
+        "width": res.w+2,
+        "height": res.h+2,
+        "stroke": "none",
+        "id": "canvas_background",
+        "opacity": 1,
+        "fill": fill || "#fff",
+        "style": "pointer-events:none"
+      }
+    });
+    svgCanvas.setCurrentLayer("Layer 1")
+    svgCanvas.setCurrentLayerPosition("1")
+  }
+
   this.selectedChanged = selectedChanged;
   this.elementChanged = elementChanged;
   this.changeAttribute = changeAttribute;
@@ -310,6 +348,7 @@ MD.Editor = function(){
   this.save = save;
   this.undo = undo;
   this.redo = redo;
+  this.clear = clear;
   this.duplicateSelected = duplicateSelected;
   this.deleteSelected = deleteSelected;
   this.cutSelected = cutSelected;
@@ -331,4 +370,15 @@ MD.Editor = function(){
   this.groupSelected = groupSelected;
   this.ungroupSelected = ungroupSelected;
   this.convertToPath = convertToPath;
+  this.createBackground = createBackground;
+  this.export = function(){ 
+    if(window.canvg) {
+        svgCanvas.rasterExport();
+      } else {
+        $.getScript('js/lib/rgbcolor.js', function() {
+          $.getScript('js/lib/canvg.js', function() {
+            svgCanvas.rasterExport();
+          });
+        });
+      }}
 }
\ No newline at end of file