fapweb: admin.js comparison

comparison admin.js @ 1067:82ecea33c477

Various cleanups.

author	Matti Hamalainen <ccr@tnsp.org>
date	Tue, 24 Jan 2017 16:43:58 +0200
parents	fb5a468e647d
children

comparison

equal deleted inserted replaced

-:511147c1e119
+:82ecea33c477
 tabHead.className = (tab == id) ? "active" : "inactive";
 if (tab == id)
 {
 // Set active tab and refresh contents
 activeTabs[tabset] = id;
-setTimeout("refreshDispatch"+ tabset +"('"+ id +"');", 10);
+setTimeout(function(qtabset, qid) {
+switch (qtabset)
+{
+case "CM": refreshDispatchCM(qid); break;
+case "CC": refreshDispatchCC(qid); break;
+case "CS": refreshDispatchCS(qid); break;
+default: jsMessageBox("Invalid tabset value: '"+ qtabset +"'.");
+}
+}, 10, tabset, id);
 jsCancelUploadCBS();
 }
 else
 {
 // Clear inactive tabs
 case "Voting"    : jsRefreshItems("tabContCCVoting", "voters", ""); break;
 case "Compos"    : jsRefreshItems("tabContCCCompos", "compos", ""); break;
 case "InfoSys"   : jsRefreshItems("tabContCCInfoSys", "infoMain", ""); break;
 case "Settings"  : jsRefreshPanels("CS", "tabContCCSettings", "settingslist", "*"); break;
 case "Entries"   : jsRefreshPanels("CM", "tabContCCEntries", "compolist", ""); break;
+default          : alert("Invalid id: '"+ id +"'.'");
 }
 }
 function refreshDispatchCS(id)
 {
 var args = jsMakePostArgs({"title":1,"text":1,"author":1}, "nn", "");
 var msuccess = function(txt)
 {
-setTimeout("refreshDispatchCC('News');", 50);
+setTimeout(function () { refreshDispatchCC("News"); }, 50);
 }
 if (args != "")
 jsSendPOSTRequest("action=add&type=news&"+args, msuccess);
 }
 function deleteNews(id)
 {
-jsDeleteItem(id, "news", "news", "refreshDispatchCC('News');", "news item");
+jsDeleteItem(id, "news", "news", function() { refreshDispatchCC("News"); }, "news item");
 }
 function updateNews(id)
 {
 {
 var args = jsMakePostArgs({"name":1,"groups":1,"oneliner":1,"email":1}, "ne", "x");
 var msuccess = function(txt)
 {
-setTimeout("refreshDispatchCC('Attendees');", 50);
+setTimeout(function() { refreshDispatchCC("Attendees"); }, 50);
 }
 if (args != "")
 jsSendPOSTRequest("action=add&type=attendees&"+args, msuccess);
 }
 function deleteAttendee(id)
 {
-jsDeleteItem(id, "attendee", "attendees", "refreshDispatchCC('Attendees');", "attendee");
+jsDeleteItem(id, "attendee", "attendees", function () { refreshDispatchCC("Attendees"); }, "attendee");
 }
 function updateAttendee(id)
 {
 {
 var args = jsMakePostArgs({"name":1, "description":1}, "nc", "");
 var msuccess = function(txt)
 {
-setTimeout("refreshDispatchCC('Compos');", 50);
+setTimeout(function () { refreshDispatchCC("Compos"); }, 50);
 }
 if (args != "")
 jsSendPOSTRequest("action=add&type=compo&"+args, msuccess);
 return false;
 }
 function deleteCompo(id)
 {
-jsDeleteItem(id, "compo", "compo", "refreshDispatchCC('Compos');", 0,
+jsDeleteItem(id, "compo", "compo", function () { refreshDispatchCC("Compos"); }, 0,
 "Are you ABSOLUTELY sure you want to delete compo #"+id+"? "+
 "This will delete all votes AND entries related to it!");
 }
 //
 // Entry management
 //
 function refreshEntryCompos()
 {
-setTimeout("refreshDispatchCC('Entries');", 50);
+setTimeout(function () { refreshDispatchCC("Entries"); }, 50);
 }
 function activateEntry(id, force)
 {
 jsCancelUploadCBS();
 var msuccess = function(txt)
 {
-setTimeout("refreshDispatchCM("+ id +");", 50);
+setTimeout(function (q) { refreshDispatchCM(qid); }, 50, id);
 refreshEntryCompos();
 }
 if (args != "")
 jsSendPOSTRequest("action=add&type=entry&compo_id="+id+"&"+args, msuccess);
 function deleteEntry(cid, id)
 {
 jsCancelUploadCBS();
-jsDeleteItem(id, "entry", "entries", "refreshDispatchCM("+ cid +");refreshEntryCompos();", "entry");
+jsDeleteItem(id, "entry", "entries", function() { refreshDispatchCM(cid); refreshEntryCompos(); }, "entry");
 }
 //
 // Votekey management