diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-02-25 19:06:14 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-02-25 19:06:14 +0000 |
| commit | 1a974ba550824dd6afe602d4534ed665c7117bea (patch) | |
| tree | 6106c84adb0216c12d30f36823f2cb895231c046 /html/javascript | |
| parent | 8cc206947676df6f2a2923e3fb68f9c9f7730897 (diff) | |
| download | xxv-1a974ba550824dd6afe602d4534ed665c7117bea.tar.gz xxv-1a974ba550824dd6afe602d4534ed665c7117bea.tar.bz2 | |
* AJAX: Message with state param.state:success or param.state:error
* xstyle/html: CONFIG - checkvalue, translate messages
* AUTOTIMER: Don't display success, if try to delete a none exist autotimer
Diffstat (limited to 'html/javascript')
| -rw-r--r-- | html/javascript/global.js | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/html/javascript/global.js b/html/javascript/global.js index 7a5748c..ba01aec 100644 --- a/html/javascript/global.js +++ b/html/javascript/global.js @@ -148,12 +148,14 @@ function checkValue (valobj, msgname, cmd, wrongMsg, goodMsg) { var wrongMsg = sData[2]; var goodMsg = sData[3]; - if(oXML.responseText.search('ERROR') > -1) { - msg.className = 'error'; - msg.innerHTML = wrongMsg.replace('%s', oXML.responseText); - } else { + var o = eval("("+oXML.responseText+")");
+ if(o && o.data && typeof(o.data) == 'string' + && o.param && o.param.state && o.param.state == 'success') { msg.className = 'good'; - msg.innerHTML = goodMsg.replace('%s', oXML.responseText); + msg.innerHTML = goodMsg.replace('%s', o.data); + } else { + msg.className = 'error'; + msg.innerHTML = wrongMsg.replace('%s', o.data); } }; @@ -162,7 +164,7 @@ function checkValue (valobj, msgname, cmd, wrongMsg, goodMsg) { msgobj.innerHTML = 'Check value ...'; if(inputvalue) { - var url = "?cmd=checkvalue&data=" + cmd + ":" + inputvalue + "&ajax=text"; + var url = "?cmd=checkvalue&data=" + cmd + ":" + inputvalue + "&ajax=json"; var aconn = new XHRequest(); if(!aconn) return false; |
