fixes
This commit is contained in:
tammo0 2019-05-31 19:51:24 +02:00
parent fefbada62d
commit 8245321f86
4 changed files with 22 additions and 22 deletions

View File

@ -58,6 +58,9 @@ const char HTTP_HEAD[] PROGMEM =
"function eb(s){" "function eb(s){"
"return document.getElementById(s);" // Save code space "return document.getElementById(s);" // Save code space
"}" "}"
"function qs(s){" // Alias to save code space
"return document.querySelector(s);"
"}"
"function idn(){" "function idn(){"
"var t=0,i=document.querySelectorAll('input,button,textarea,select'); while(i.length>=t){ if(i[t]) {i[t]['name']=(i[t].hasAttribute('id')&&(!i[t].hasAttribute('name')))?i[t]['id']:i[t]['name'];}t++;}" "var t=0,i=document.querySelectorAll('input,button,textarea,select'); while(i.length>=t){ if(i[t]) {i[t]['name']=(i[t].hasAttribute('id')&&(!i[t].hasAttribute('name')))?i[t]['id']:i[t]['name'];}t++;}"
"}" "}"
@ -319,7 +322,7 @@ const char HTTP_FORM_TEMPLATE_FLAG[] PROGMEM =
const char HTTP_FORM_MODULE[] PROGMEM = const char HTTP_FORM_MODULE[] PROGMEM =
"<fieldset><legend><b>&nbsp;" D_MODULE_PARAMETERS "&nbsp;</b></legend>" "<fieldset><legend><b>&nbsp;" D_MODULE_PARAMETERS "&nbsp;</b></legend>"
"<form method='get' action='md'>" "<form method='get' action='md'>"
"<p></p><b>" D_MODULE_TYPE "</b> (%s)<br><select id='g99'></select><br>" "<p></p><b>" D_MODULE_TYPE "</b> (%s)<br><select id='g99' name='g99'></select><br>"
"<br><table>"; "<br><table>";
const char HTTP_FORM_WIFI[] PROGMEM = const char HTTP_FORM_WIFI[] PROGMEM =

View File

@ -434,14 +434,14 @@ const char HTTP_FORM_DOMOTICZ[] PROGMEM =
"<form method='post' action='" WEB_HANDLE_DOMOTICZ "'>" "<form method='post' action='" WEB_HANDLE_DOMOTICZ "'>"
"<table>"; "<table>";
const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM = const char HTTP_FORM_DOMOTICZ_RELAY[] PROGMEM =
"<tr><td style='width:260px'><b>" D_DOMOTICZ_IDX " %d</b></td><td style='width:70px'><input id='r%d' name='r%d' placeholder='0' value='%d'></td></tr>" "<tr><td style='width:260px'><b>" D_DOMOTICZ_IDX " %d</b></td><td style='width:70px'><input id='r%d' placeholder='0' value='%d'></td></tr>"
"<tr><td style='width:260px'><b>" D_DOMOTICZ_KEY_IDX " %d</b></td><td style='width:70px'><input id='k%d' name='k%d' placeholder='0' value='%d'></td></tr>"; "<tr><td style='width:260px'><b>" D_DOMOTICZ_KEY_IDX " %d</b></td><td style='width:70px'><input id='k%d' placeholder='0' value='%d'></td></tr>";
const char HTTP_FORM_DOMOTICZ_SWITCH[] PROGMEM = const char HTTP_FORM_DOMOTICZ_SWITCH[] PROGMEM =
"<tr><td style='width:260px'><b>" D_DOMOTICZ_SWITCH_IDX " %d</b></td><td style='width:70px'><input id='s%d' name='s%d' placeholder='0' value='%d'></td></tr>"; "<tr><td style='width:260px'><b>" D_DOMOTICZ_SWITCH_IDX " %d</b></td><td style='width:70px'><input id='s%d' placeholder='0' value='%d'></td></tr>";
const char HTTP_FORM_DOMOTICZ_SENSOR[] PROGMEM = const char HTTP_FORM_DOMOTICZ_SENSOR[] PROGMEM =
"<tr><td style='width:260px'><b>" D_DOMOTICZ_SENSOR_IDX " %d</b> %s</td><td style='width:70px'><input id='l%d' name='l%d' placeholder='0' value='%d'></td></tr>"; "<tr><td style='width:260px'><b>" D_DOMOTICZ_SENSOR_IDX " %d</b> %s</td><td style='width:70px'><input id='l%d' placeholder='0' value='%d'></td></tr>";
const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM = const char HTTP_FORM_DOMOTICZ_TIMER[] PROGMEM =
"<tr><td style='width:260px'><b>" D_DOMOTICZ_UPDATE_TIMER "</b> (" STR(DOMOTICZ_UPDATE_TIMER) ")</td><td style='width:70px'><input id='ut' name='ut' placeholder='" STR(DOMOTICZ_UPDATE_TIMER) "' value='%d'</td></tr>"; "<tr><td style='width:260px'><b>" D_DOMOTICZ_UPDATE_TIMER "</b> (" STR(DOMOTICZ_UPDATE_TIMER) ")</td><td style='width:70px'><input id='ut' placeholder='" STR(DOMOTICZ_UPDATE_TIMER) "' value='%d'></td></tr>";
void HandleDomoticzConfiguration(void) void HandleDomoticzConfiguration(void)
{ {

View File

@ -523,9 +523,6 @@ const char HTTP_BTN_MENU_TIMER[] PROGMEM =
const char HTTP_TIMER_SCRIPT1[] PROGMEM = const char HTTP_TIMER_SCRIPT1[] PROGMEM =
"var pt=[],ct=99;" "var pt=[],ct=99;"
"function qs(s){" // Alias to save code space
"return document.querySelector(s);"
"}"
"function ce(i,q){" // Create select option "function ce(i,q){" // Create select option
"var o=document.createElement('option');" "var o=document.createElement('option');"
"o.textContent=i;" "o.textContent=i;"
@ -660,22 +657,22 @@ const char HTTP_FORM_TIMER1[] PROGMEM =
"<fieldset style='min-width:470px;text-align:center;'>" "<fieldset style='min-width:470px;text-align:center;'>"
"<legend style='text-align:left;'><b>&nbsp;" D_TIMER_PARAMETERS "&nbsp;</b></legend>" "<legend style='text-align:left;'><b>&nbsp;" D_TIMER_PARAMETERS "&nbsp;</b></legend>"
"<form method='post' action='" WEB_HANDLE_TIMER "' onsubmit='return st();'>" "<form method='post' action='" WEB_HANDLE_TIMER "' onsubmit='return st();'>"
"<br><input id='e0' type='checkbox'%s><b>" D_TIMER_ENABLE "</b><br><br><hr/>" "<br/><input id='e0' type='checkbox'%s><b>" D_TIMER_ENABLE "</b><br/><br/><hr/>"
"<input id='t0' value='"; "<input id='t0' value='";
const char HTTP_FORM_TIMER2[] PROGMEM = const char HTTP_FORM_TIMER2[] PROGMEM =
"' hidden><div id='bt'></div><br><br><br>" "' hidden><div id='bt'></div><br/><br/><br/>"
"<div id='oa'></div><br>" "<div id='oa' name='oa'></div><br/>"
"<div>" "<div>"
"<input id='a0' type='checkbox'><b>" D_TIMER_ARM "</b>&emsp;" "<input id='a0' type='checkbox'><b>" D_TIMER_ARM "</b>&emsp;"
"<input id='r0' type='checkbox'><b>" D_TIMER_REPEAT "</b>" "<input id='r0' type='checkbox'><b>" D_TIMER_REPEAT "</b>"
"</div><br>" "</div><br/>"
"<div>"; "<div>";
#ifdef USE_SUNRISE #ifdef USE_SUNRISE
const char HTTP_FORM_TIMER3[] PROGMEM = const char HTTP_FORM_TIMER3[] PROGMEM =
"<fieldset style='width:%dpx;margin:auto;text-align:left;border:0;'>" "<fieldset style='width:%dpx;margin:auto;text-align:left;border:0;'>"
"<input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIMER_TIME "</b><br>" "<input id='b0' name='rd' type='radio' value='0' onclick='gt();'><b>" D_TIMER_TIME "</b><br/>"
"<input id='b1' name='rd' type='radio' value='1' onclick='gt();'><b>" D_SUNRISE "</b> (%s)<br>" "<input id='b1' name='rd' type='radio' value='1' onclick='gt();'><b>" D_SUNRISE "</b> (%s)<br/>"
"<input id='b2' name='rd' type='radio' value='2' onclick='gt();'><b>" D_SUNSET "</b> (%s)<br>" "<input id='b2' name='rd' type='radio' value='2' onclick='gt();'><b>" D_SUNSET "</b> (%s)<br/>"
"</fieldset>" "</fieldset>"
"<p></p>" "<p></p>"
"<span><select style='width:46px;' id='dr'></select></span>" "<span><select style='width:46px;' id='dr'></select></span>"
@ -690,7 +687,7 @@ const char HTTP_FORM_TIMER4[] PROGMEM =
"<span><select style='width:60px;' id='mi'></select></span>" "<span><select style='width:60px;' id='mi'></select></span>"
"&emsp;<b>+/-</b>&nbsp;" "&emsp;<b>+/-</b>&nbsp;"
"<span><select style='width:60px;' id='mw'></select></span>" "<span><select style='width:60px;' id='mw'></select></span>"
"</div><br>" "</div><br/>"
"<div id='ds' name='ds'></div>"; "<div id='ds' name='ds'></div>";
void HandleTimerConfiguration(void) void HandleTimerConfiguration(void)

View File

@ -2394,15 +2394,15 @@ const char HTTP_FORM_SCRIPT1[] PROGMEM =
const char HTTP_FORM_SCRIPT1b[] PROGMEM = const char HTTP_FORM_SCRIPT1b[] PROGMEM =
"</textarea>" "</textarea>"
"<script type='text/javascript'>" "<script type='text/javascript'>"
"document.getElementById('charNum').innerHTML='-';" "eb('charNum').innerHTML='-';"
"var textarea=document.querySelector('textarea');" "var textarea=qs('textarea');"
"textarea.addEventListener('input',function(){" "textarea.addEventListener('input',function(){"
"var ml=this.getAttribute('maxlength');" "var ml=this.getAttribute('maxlength');"
"var cl=this.value.length;" "var cl=this.value.length;"
"if(cl>=ml){" "if(cl>=ml){"
"document.getElementById('charNum').innerHTML='no more chars';" "eb('charNum').innerHTML='no more chars';"
"}else{" "}else{"
"document.getElementById('charNum').innerHTML=ml-cl+' chars left';" "eb('charNum').innerHTML=ml-cl+' chars left';"
"}" "}"
"});" "});"