From fc0a16a55e13dfca761ca2913311b894265f3e66 Mon Sep 17 00:00:00 2001 From: Marc Delisle Date: Wed, 18 Apr 2012 12:52:08 -0400 Subject: [PATCH] Replace layer_alert() with PMA_ajaxShowMessage(), thanks to Rouslan Placella for the suggestion. --- js/pmd/ajax.js | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/js/pmd/ajax.js b/js/pmd/ajax.js index 15c25ac322..d67af5409c 100644 --- a/js/pmd/ajax.js +++ b/js/pmd/ajax.js @@ -52,6 +52,7 @@ function makeRequest(url, parameters) function alertContents() { if (http_request.readyState == 1) { + // @todo: replace with PMA_ajaxShowMessage() and remove layer_action document.getElementById("layer_action").style.left = (document.body.clientWidth + document.body.scrollLeft - 85) + 'px'; document.getElementById("layer_action").style.top = (document.body.scrollTop + 10) + 'px'; document.getElementById("layer_action").style.visibility = 'visible'; document.getElementById("layer_action").innerHTML = 'Loading...'; @@ -75,14 +76,6 @@ function alertContents() } } -function layer_alert(text) -{ - document.getElementById("layer_action").innerHTML = text; - document.getElementById("layer_action").style.left = (document.body.clientWidth + document.body.scrollLeft - 20 - document.getElementById("layer_action").offsetWidth) + 'px'; - document.getElementById("layer_action").style.display = 'block'; - setTimeout(function(){document.getElementById("layer_action").style.visibility = 'hidden';}, 2000); -} - /** * */ @@ -103,17 +96,17 @@ function PrintXML() //xmldoc.getElementsByTagName('root')[0].getAttribute("act") if (root.getAttribute('act') == 'save_pos') { - layer_alert(root.getAttribute('return')); + PMA_ajaxShowMessage(root.getAttribute('return')); } if (root.getAttribute('act') == 'relation_upd') { - layer_alert(root.getAttribute('return')); + PMA_ajaxShowMessage(root.getAttribute('return')); if (root.getAttribute('b') == '1') { contr.splice(root.getAttribute('K'), 1); Re_load(); } } if (root.getAttribute('act') == 'relation_new') { - layer_alert(root.getAttribute('return')); + PMA_ajaxShowMessage(root.getAttribute('return')); if (root.getAttribute('b') == '1') { var i = contr.length; var t1 = root.getAttribute('DB1') + '.' + root.getAttribute('T1');