From 8335c388308d381afc8b4b544f0b9b88e2140c25 Mon Sep 17 00:00:00 2001 From: Alexandre Cloutier Date: Mon, 30 Jun 2014 13:57:10 -0400 Subject: [PATCH] fix infinite loop bug --- UI/WebServerResources/SchedulerUI.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/UI/WebServerResources/SchedulerUI.js b/UI/WebServerResources/SchedulerUI.js index 75a5c89c7..da44ad6d5 100644 --- a/UI/WebServerResources/SchedulerUI.js +++ b/UI/WebServerResources/SchedulerUI.js @@ -1106,6 +1106,7 @@ function eventsListCallback(http) { function activeTasksCallback(http) { if (http.readyState == 4 && http.status == 200) { if (http.responseText.length > 0) { + document.activeTasksAjaxRequest = null; var data = http.responseText.evalJSON(true); var list = $("calendarList"); @@ -1115,7 +1116,6 @@ function activeTasksCallback(http) { var number = data[id]; var input = items[i].childNodesWithTag("input")[0]; var activeTasks = items[i].childNodesWithTag("span")[0]; - $(input).observe("click", clickEventWrapper(updateCalendarStatus)); if (number == "0") { activeTasks.innerHTML = ""; } @@ -2360,6 +2360,10 @@ function _loadTasksHref(href) { document.tasksListAjaxRequest.aborted = true; document.tasksListAjaxRequest.abort(); } + if (document.activeTasksAjaxRequest) { + document.activeTasksAjaxRequest.aborted = true; + document.activeTasksAjaxRequest.abort(); + } url = ApplicationBaseURL + "/" + href; urlActiveTasks = ApplicationBaseURL + "/activeTasks"; @@ -2372,7 +2376,7 @@ function _loadTasksHref(href) { document.tasksListAjaxRequest = triggerAjaxRequest(url, tasksListCallback, selectedIds); - triggerAjaxRequest(urlActiveTasks, activeTasksCallback); + document.activeTasksAjaxRequest = triggerAjaxRequest(urlActiveTasks, activeTasksCallback); return true; }