Mercurial > hg > fapweb

changeset 343:e799da13c0f3

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename messageBox() to jsMessageBox().
author Matti Hamalainen <ccr@tnsp.org>
date Mon, 02 Dec 2013 01:21:03 +0200
parents 3175ec252c73
children 6d50238a2d50
files admin.php majax.php vote.inc.php
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/admin.php	Mon Dec 02 01:19:57 2013 +0200
+++ b/admin.php	Mon Dec 02 01:21:03 2013 +0200
@@ -182,7 +182,7 @@
           switchActiveTab("CM", activeTabs["CM"]);
       }
       catch (err) {
-        messageBox("JSON.parse("+ txt +") failure: "+ err);
+        jsMessageBox("JSON.parse("+ txt +") failure: "+ err);
       }
     }
   }
--- a/majax.php	Mon Dec 02 01:19:57 2013 +0200
+++ b/majax.php	Mon Dec 02 01:21:03 2013 +0200
@@ -12,11 +12,11 @@
   echo "<script type=\"text/javascript\">\n";
 
 ?>
-function messageBox(msg)
 {
   alert(msg);
 }
 
+function jsMessageBox(msg)
 
 function confirmBox(msg)
 {
--- a/vote.inc.php	Mon Dec 02 01:19:57 2013 +0200
+++ b/vote.inc.php	Mon Dec 02 01:21:03 2013 +0200
@@ -88,7 +88,7 @@
 
   var mfail = function(txt)
   {
-    messageBox("Something went wrong. :(");
+    jsMessageBox("Something went wrong. :(");
   }
 
   jsSendPOSTRequest("action=set&entry_id="+eid+"&vote="+value, msuccess, mfail);