From c6e21beade4d5f4d2ff78ebcfe922069ee56e5ea Mon Sep 17 00:00:00 2001 From: rudolfkoenig Date: Tue, 3 Apr 2018 19:51:36 +0000 Subject: [PATCH] fhemweb.js: always present error in a dialog (Forum #86548) git-svn-id: https://svn.fhem.de/fhem/trunk@16546 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/www/pgm2/fhemweb.js | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/fhem/www/pgm2/fhemweb.js b/fhem/www/pgm2/fhemweb.js index 7a021356b..2c38213bf 100644 --- a/fhem/www/pgm2/fhemweb.js +++ b/fhem/www/pgm2/fhemweb.js @@ -673,7 +673,7 @@ FW_inlineModify() // Do not generate a new HTML page upon pressing modify var newDef = typeof cm !== 'undefined' ? cm.getValue() : $(this).closest("form").find("textarea").val(); var cmd = $(this).attr("name")+"="+$(this).attr("value")+" "+newDef; - var isDef = true; + var isDef = true, reloadIfOk = false; if(newDef == undefined || $(this).attr("value").indexOf("modify") != 0) { isDef = false; @@ -685,9 +685,12 @@ FW_inlineModify() // Do not generate a new HTML page upon pressing modify var ifid = (devName+"-"+arg).replace(/([^_a-z0-9])/gi, function(m){ return "\\"+m }); if($(".dval[informid="+ifid+"]").length == 0) { - log("PSC reload"); - $(this).unbind('click').click();// No element found to replace, reload - return; + if(cmd == "attr") { + reloadIfOk = true; + } else { + $(this).unbind('click').click();// No element found to replace, reload + return; + } } newDef = $(this).closest("form").find("input:text").val(); if(newDef == undefined) @@ -696,6 +699,8 @@ FW_inlineModify() // Do not generate a new HTML page upon pressing modify } FW_cmd(FW_root+"?"+encodeURIComponent(cmd)+"&XHR=1", function(resp){ + if(!resp && reloadIfOk) + location.reload(); if(resp) { resp = FW_htmlQuote(resp); if(resp.indexOf("\n") >= 0)