diff --git a/src/css/text.css b/src/css/text.css index a799bcd..b4b252c 100644 --- a/src/css/text.css +++ b/src/css/text.css @@ -76,8 +76,4 @@ #textpath-panel { display: none; -} - -.text-path #textpath-panel { - display: block; } \ No newline at end of file diff --git a/src/index.html b/src/index.html index 6784322..4edadd2 100644 --- a/src/index.html +++ b/src/index.html @@ -77,12 +77,12 @@ diff --git a/src/js/Import.js b/src/js/Import.js index 11846f8..c544e5e 100644 --- a/src/js/Import.js +++ b/src/js/Import.js @@ -1,15 +1,13 @@ MD.Import = function(){ const workarea = document.getElementById("workarea"); - const $importInput = $('#tool_import + input'); - const $openInput = $('#tool_open + input'); + const $importInput = $('#tool_import input'); + const $openInput = $('#tool_open input'); - $('#tool_import').on("click", place); - $('#tool_open').on("click", open); - - $importInput.change(importImage); - $openInput.change(openImage); + $importInput.on("change", importImage); + $openInput.on("change", openImage); function importImage(e){ + $('#menu_bar').removeClass('active') if (!window.FileReader) return; //e.stopPropagation(); //e.preventDefault(); @@ -90,6 +88,7 @@ MD.Import = function(){ } function openImage(e){ + $('#menu_bar').removeClass('active') const f = this; if(f.files.length === 1) { svgCanvas.clear(); @@ -124,7 +123,6 @@ MD.Import = function(){ } function open(){ - console.log("open") $openInput.trigger("click"); }