From 26281294ab179a5d6eb33902aa93f40f89647433 Mon Sep 17 00:00:00 2001 From: mikum Date: Wed, 8 Jun 2016 10:39:27 +0800 Subject: [PATCH 1/7] Add key short for the save file --- src/script.js | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/script.js b/src/script.js index 3305c33..d45bb98 100644 --- a/src/script.js +++ b/src/script.js @@ -176,7 +176,7 @@ e.preventDefault(); }); - saveHtmlBtn.addEventListener('click', function (e) { + function save_file() { var html = editur.cm.html.getValue(); var css = editur.cm.css.getValue(); var js = editur.cm.js.getValue(); @@ -197,7 +197,18 @@ document.body.appendChild(a); a.click(); a.remove(); + } + + saveHtmlBtn.addEventListener('click', function (e) { + save_file(); }); + + window.addEventListener('keydown',function(event) { + if ((event.ctrlKey)&&(event.keyCode==83)){ + event.returnValue=false; + save_file(); + } + }) window.addEventListener('click', function(e) { if (typeof e.target.className === 'string' && e.target.className.indexOf('modal-overlay') !== -1) { From 2a9a8aae8f1acc9d86799962bd43cc774b962958 Mon Sep 17 00:00:00 2001 From: mikum Date: Wed, 8 Jun 2016 10:44:57 +0800 Subject: [PATCH 2/7] Fix the format --- src/script.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/script.js b/src/script.js index d45bb98..c131aca 100644 --- a/src/script.js +++ b/src/script.js @@ -197,7 +197,7 @@ document.body.appendChild(a); a.click(); a.remove(); - } + }; saveHtmlBtn.addEventListener('click', function (e) { save_file(); @@ -208,7 +208,7 @@ event.returnValue=false; save_file(); } - }) + }); window.addEventListener('click', function(e) { if (typeof e.target.className === 'string' && e.target.className.indexOf('modal-overlay') !== -1) { From db502d0a5096730a9df67473ba7b9d27650d0446 Mon Sep 17 00:00:00 2001 From: mikum Date: Wed, 8 Jun 2016 21:40:29 +0800 Subject: [PATCH 3/7] Fix --- src/script.js | 56 +++++++++++++++++++++++++-------------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/src/script.js b/src/script.js index c131aca..5ee071a 100644 --- a/src/script.js +++ b/src/script.js @@ -176,38 +176,15 @@ e.preventDefault(); }); - function save_file() { - var html = editur.cm.html.getValue(); - var css = editur.cm.css.getValue(); - var js = editur.cm.js.getValue(); - - var fileContent = '\n\n\n\n' - + html + '\n\n\n\n'; - - var d = new Date(); - var fileName = [ 'web-maker', d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds() ].join('-'); - fileName += '.html'; - - var a = document.createElement('a'); - var blob = new Blob([ fileContent ], {type : "text/html;charset=UTF-8"}); - a.href = window.URL.createObjectURL(blob); - a.download = fileName; - a.style.display = 'none'; - document.body.appendChild(a); - a.click(); - a.remove(); - }; - saveHtmlBtn.addEventListener('click', function (e) { - save_file(); + save_file(); }); window.addEventListener('keydown',function(event) { - if ((event.ctrlKey)&&(event.keyCode==83)){ - event.returnValue=false; - save_file(); - } + if ((event.ctrlKey)&&(event.keyCode==83)){ + event.preventDefault(); + save_file(); + } }); window.addEventListener('click', function(e) { @@ -258,6 +235,29 @@ }); } + function save_file() { + var html = editur.cm.html.getValue(); + var css = editur.cm.css.getValue(); + var js = editur.cm.js.getValue(); + + var fileContent = '\n\n\n\n' + + html + '\n\n\n\n'; + + var d = new Date(); + var fileName = [ 'web-maker', d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds() ].join('-'); + fileName += '.html'; + + var a = document.createElement('a'); + var blob = new Blob([ fileContent ], {type : "text/html;charset=UTF-8"}); + a.href = window.URL.createObjectURL(blob); + a.download = fileName; + a.style.display = 'none'; + document.body.appendChild(a); + a.click(); + a.remove(); + }; + init(); })(); \ No newline at end of file From ed9bb17d1050c3e3e61f82164a09b2e423b3936f Mon Sep 17 00:00:00 2001 From: mikum Date: Wed, 8 Jun 2016 21:43:33 +0800 Subject: [PATCH 4/7] Change the function name --- src/script.js | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/script.js b/src/script.js index 5ee071a..a35a7b6 100644 --- a/src/script.js +++ b/src/script.js @@ -177,13 +177,13 @@ }); saveHtmlBtn.addEventListener('click', function (e) { - save_file(); + saveFile(); }); window.addEventListener('keydown',function(event) { if ((event.ctrlKey)&&(event.keyCode==83)){ event.preventDefault(); - save_file(); + saveFile(); } }); @@ -235,14 +235,14 @@ }); } - function save_file() { - var html = editur.cm.html.getValue(); - var css = editur.cm.css.getValue(); - var js = editur.cm.js.getValue(); + function saveFile() { + var html = editur.cm.html.getValue(); + var css = editur.cm.css.getValue(); + var js = editur.cm.js.getValue(); - var fileContent = '\n\n\n\n' - + html + '\n\n\n\n'; + var fileContent = '\n\n\n\n' + + html + '\n\n\n\n'; var d = new Date(); var fileName = [ 'web-maker', d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds() ].join('-'); @@ -256,7 +256,7 @@ document.body.appendChild(a); a.click(); a.remove(); - }; + }; init(); From de34ff71a34f45917636c532b815786ad057ab15 Mon Sep 17 00:00:00 2001 From: mikum Date: Thu, 9 Jun 2016 16:27:12 +0800 Subject: [PATCH 5/7] Fix the indent --- src/script.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/src/script.js b/src/script.js index a35a7b6..6e7c1bc 100644 --- a/src/script.js +++ b/src/script.js @@ -244,18 +244,18 @@ + css + '\n\n\n\n' + html + '\n\n\n\n'; - var d = new Date(); - var fileName = [ 'web-maker', d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds() ].join('-'); - fileName += '.html'; + var d = new Date(); + var fileName = [ 'web-maker', d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds() ].join('-'); + fileName += '.html'; - var a = document.createElement('a'); - var blob = new Blob([ fileContent ], {type : "text/html;charset=UTF-8"}); - a.href = window.URL.createObjectURL(blob); - a.download = fileName; - a.style.display = 'none'; - document.body.appendChild(a); - a.click(); - a.remove(); + var a = document.createElement('a'); + var blob = new Blob([ fileContent ], {type : "text/html;charset=UTF-8"}); + a.href = window.URL.createObjectURL(blob); + a.download = fileName; + a.style.display = 'none'; + document.body.appendChild(a); + a.click(); + a.remove(); }; init(); From 033c1f5f5943894bb846a486a329f2ba5e366ab5 Mon Sep 17 00:00:00 2001 From: mikum Date: Thu, 9 Jun 2016 16:54:53 +0800 Subject: [PATCH 6/7] Add metaKey for mac --- src/script.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/script.js b/src/script.js index 6e7c1bc..3e7a702 100644 --- a/src/script.js +++ b/src/script.js @@ -181,7 +181,7 @@ }); window.addEventListener('keydown',function(event) { - if ((event.ctrlKey)&&(event.keyCode==83)){ + if ((event.ctrlKey || event.metaKey)&&(event.keyCode==83)){ event.preventDefault(); saveFile(); } From 00f211b6ddb2b08851de39f4ddd8b779fe341d0f Mon Sep 17 00:00:00 2001 From: Kushagra Gour Date: Tue, 5 Jul 2016 15:28:13 +0530 Subject: [PATCH 7/7] eslint fixes. --- src/script.js | 59 +++++++++++++++++++++++++-------------------------- 1 file changed, 29 insertions(+), 30 deletions(-) diff --git a/src/script.js b/src/script.js index 602ef0d..70aa323 100644 --- a/src/script.js +++ b/src/script.js @@ -114,6 +114,29 @@ }, errorHandler); }; + function saveFile() { + var html = editur.cm.html.getValue(); + var css = editur.cm.css.getValue(); + var js = editur.cm.js.getValue(); + + var fileContent = '\n\n\n\n' + + html + '\n\n\n\n'; + + var d = new Date(); + var fileName = [ 'web-maker', d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds() ].join('-'); + fileName += '.html'; + + var a = document.createElement('a'); + var blob = new Blob([ fileContent ], {type: "text/html;charset=UTF-8"}); + a.href = window.URL.createObjectURL(blob); + a.download = fileName; + a.style.display = 'none'; + document.body.appendChild(a); + a.click(); + a.remove(); + } + function initEditor(element, options) { var cm = CodeMirror(element, { mode: options.mode, @@ -177,16 +200,15 @@ e.preventDefault(); }); - saveHtmlBtn.addEventListener('click', function (e) { + saveHtmlBtn.addEventListener('click', function () { saveFile(); }); - - window.addEventListener('keydown',function(event) { - if ((event.ctrlKey || event.metaKey)&&(event.keyCode==83)){ - event.preventDefault(); - saveFile(); - } + window.addEventListener('keydown', function (event) { + if ((event.ctrlKey || event.metaKey) && (event.keyCode === 83)){ + event.preventDefault(); + saveFile(); + } }); window.addEventListener('click', function(e) { @@ -237,29 +259,6 @@ }); } - function saveFile() { - var html = editur.cm.html.getValue(); - var css = editur.cm.css.getValue(); - var js = editur.cm.js.getValue(); - - var fileContent = '\n\n\n\n' - + html + '\n\n\n\n'; - - var d = new Date(); - var fileName = [ 'web-maker', d.getFullYear(), d.getMonth(), d.getDate(), d.getHours(), d.getMinutes(), d.getSeconds() ].join('-'); - fileName += '.html'; - - var a = document.createElement('a'); - var blob = new Blob([ fileContent ], {type : "text/html;charset=UTF-8"}); - a.href = window.URL.createObjectURL(blob); - a.download = fileName; - a.style.display = 'none'; - document.body.appendChild(a); - a.click(); - a.remove(); - }; - init(); })(); \ No newline at end of file