amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-03-15 11:51:23 +00:00
Code Issues Projects Releases Wiki Activity

Fix JavaScript from merge leftover

Browse Source
This commit is contained in:
Francis Lachapelle
2014-07-21 16:06:24 -04:00
parent 8dd967d0a8
commit 24f9d83ff7
1 changed files with 0 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
UI/WebServerResources/SchedulerUI.js
View File

@@ -1117,8 +1117,6 @@ function activeTasksCallback(http) {
document.activeTasksAjaxRequest = null;
var data = http.responseText.evalJSON(true);
var list = $("calendarList");
<<<<<<< HEAD
var items = list.childNodesWithTag("li");
for (var i = 0; i < items.length; i++) {
var id = items[i].getAttribute("id").substr(1);
@@ -1136,20 +1134,6 @@ function activeTasksCallback(http) {
}
if (number > 0) {
activeTasks.innerHTML = number;
=======
var items = list.childNodesWithTag("li");
for (var i = 0; i < items.length; i++) {
var id = items[i].getAttribute("id").substr(1);
var number = data[id];
var input = items[i].childNodesWithTag("input")[0];
var activeTasks = items[i].childNodesWithTag("span")[0];
if (number == "0") {
activeTasks.innerHTML = "";
}
else {
activeTasks.innerHTML = "(" + number + ")";
>>>>>>> added event7.png and adjust javascript indentation
}
}
}