From 52b78a42b974a5de77df65d78227f8a293d3da8f Mon Sep 17 00:00:00 2001 From: Kayo Phoenix Date: Sat, 14 Nov 2015 00:53:40 +0500 Subject: [PATCH] Moved console send js from console.html to console.js --- html/console.html | 84 +-------------------------------------------- html/console.js | 86 +++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 87 insertions(+), 83 deletions(-) diff --git a/html/console.html b/html/console.html index c3b9fab..201f82a 100644 --- a/html/console.html +++ b/html/console.html @@ -58,90 +58,8 @@ function(data) { showRate(data.rate); }, function(s, st) { showNotification(st); } ); - - var sendHistory = $("#send-history"); - var inputText = $("#input-text"); - var inputAddCr = $("#input-add-cr"); - var inputAddLf = $("#input-add-lf"); - - function findHistory(text) { - for (var i = 0; i < sendHistory.children.length; i++) { - if (text == sendHistory.children[i].value) { - return i; - } - } - return null; - } - - function loadHistory(idx) { - sendHistory.value = sendHistory.children[idx].value; - inputText.value = sendHistory.children[idx].value; - } - - function navHistory(rel) { - var idx = findHistory(sendHistory.value) + rel; - if (idx < 0) { - idx = sendHistory.children.length - 1; - } - if (idx >= sendHistory.children.length) { - idx = 0; - } - loadHistory(idx); - } - - sendHistory.addEventListener("change", function(e) { - inputText.value = sendHistory.value; - }); - function pushHistory(text) { - var idx = findHistory(text); - if (idx !== null) { - loadHistory(idx); - return false; - } - var newOption = m(''); - newOption.value = text; - sendHistory.appendChild(newOption); - sendHistory.value = text; - for (; sendHistory.children.length > 15; ) { - sendHistory.removeChild(sendHistory.children[0]); - } - return true; - } - - inputText.addEventListener("keydown", function(e) { - switch (e.keyCode) { - case 38: /* the up arrow key pressed */ - e.preventDefault(); - navHistory(-1); - break; - case 40: /* the down arrow key pressed */ - e.preventDefault(); - navHistory(+1); - break; - case 27: /* the escape key pressed */ - e.preventDefault(); - inputText.value = ""; - sendHistory.value = ""; - break; - case 13: /* the enter key pressed */ - e.preventDefault(); - var text = inputText.value; - if (inputAddCr.checked) text += '\r'; - if (inputAddLf.checked) text += '\n'; - ajaxSpin('POST', "/console/send?text=" + encodeURIComponent(text), - function(resp) { showNotification("uC sent"); pushHistory(inputText.value); }, - function(s, st) { showWarning("Error sending text to uC"); } - ); - break; - } - }); + consoleSendInit(); }); diff --git a/html/console.js b/html/console.js index 87f7d1a..1080d0a 100644 --- a/html/console.js +++ b/html/console.js @@ -59,6 +59,92 @@ function baudButton(baud) { }); } +function consoleSendInit() { + var sendHistory = $("#send-history"); + var inputText = $("#input-text"); + var inputAddCr = $("#input-add-cr"); + var inputAddLf = $("#input-add-lf"); + + function findHistory(text) { + for (var i = 0; i < sendHistory.children.length; i++) { + if (text == sendHistory.children[i].value) { + return i; + } + } + return null; + } + + function loadHistory(idx) { + sendHistory.value = sendHistory.children[idx].value; + inputText.value = sendHistory.children[idx].value; + } + + function navHistory(rel) { + var idx = findHistory(sendHistory.value) + rel; + if (idx < 0) { + idx = sendHistory.children.length - 1; + } + if (idx >= sendHistory.children.length) { + idx = 0; + } + loadHistory(idx); + } + + sendHistory.addEventListener("change", function(e) { + inputText.value = sendHistory.value; + }); + + function pushHistory(text) { + var idx = findHistory(text); + if (idx !== null) { + loadHistory(idx); + return false; + } + var newOption = m(''); + newOption.value = text; + sendHistory.appendChild(newOption); + sendHistory.value = text; + for (; sendHistory.children.length > 15; ) { + sendHistory.removeChild(sendHistory.children[0]); + } + return true; + } + + inputText.addEventListener("keydown", function(e) { + switch (e.keyCode) { + case 38: /* the up arrow key pressed */ + e.preventDefault(); + navHistory(-1); + break; + case 40: /* the down arrow key pressed */ + e.preventDefault(); + navHistory(+1); + break; + case 27: /* the escape key pressed */ + e.preventDefault(); + inputText.value = ""; + sendHistory.value = ""; + break; + case 13: /* the enter key pressed */ + e.preventDefault(); + var text = inputText.value; + if (inputAddCr.checked) text += '\r'; + if (inputAddLf.checked) text += '\n'; + ajaxSpin('POST', "/console/send?text=" + encodeURIComponent(text), + function(resp) { showNotification("uC sent"); pushHistory(inputText.value); }, + function(s, st) { showWarning("Error sending text to uC"); } + ); + break; + } + }); +} + //===== Log page function showDbgMode(mode) {