some defensive coding for badly formed or erroneous data

thegrubbsian · Jun 19, 2010 · 101796a · 101796a
1 parent ba44ca5
commit 101796a
Showing 1 changed file with 25 additions and 21 deletions.
diff --git a/jquery.ganttView.js b/jquery.ganttView.js
@@ -162,27 +162,30 @@ slideWidth: number
                 for (var j = 0; j < data[i].series.length; j++) {
                     var series = data[i].series[j];
                     var size = DateUtils.daysBetween(series.start, series.end);
-                    var offset = DateUtils.daysBetween(start, series.start);
-                    var blockDiv = jQuery("<div>", {
-                        "class": "ganttview-block",
-                        "title": series.name + ", " + size + " days",
-                        "css": {
-                            "width": ((size * cellWidth) - 9) + "px",
-                            "margin-left": ((offset * cellWidth) + 3) + "px"
-                        }
-                    }).data("block-data", {
-                        id: data[i].id,
-                        itemName: data[i].name,
-                        seriesName: series.name,
-                        start: Date.parse(series.start),
-                        end: Date.parse(series.end),
-                        color: series.color
-                    });
-                    if (data[i].series[j].color) {
-                        blockDiv.css("background-color", data[i].series[j].color);
-                    }
-                    blockDiv.append($("<div>", { "class": "ganttview-block-text" }).text(size));
-                    jQuery(rows[rowIdx]).append(blockDiv);
+					if (size && size > 0) {
+						if (size > 365) { size = 365; } // Keep blocks from overflowing a year
+                    	var offset = DateUtils.daysBetween(start, series.start);
+	                    var blockDiv = jQuery("<div>", {
+	                        "class": "ganttview-block",
+	                        "title": series.name + ", " + size + " days",
+	                        "css": {
+	                            "width": ((size * cellWidth) - 9) + "px",
+	                            "margin-left": ((offset * cellWidth) + 3) + "px"
+	                        }
+	                    }).data("block-data", {
+	                        id: data[i].id,
+	                        itemName: data[i].name,
+	                        seriesName: series.name,
+	                        start: Date.parse(series.start),
+	                        end: Date.parse(series.end),
+	                        color: series.color
+	                    });
+	                    if (data[i].series[j].color) {
+	                        blockDiv.css("background-color", data[i].series[j].color);
+	                    }
+	                    blockDiv.append($("<div>", { "class": "ganttview-block-text" }).text(size));
+	                    jQuery(rows[rowIdx]).append(blockDiv);
+					}
                     rowIdx = rowIdx + 1;
                 }
             }
@@ -215,6 +218,7 @@ slideWidth: number
 
     var DateUtils = {
         daysBetween: function (start, end) {
+			if (!start || !end) return 0;
             start = Date.parse(start); end = Date.parse(end);
             var count = 0, date = start.clone();
             while (date.compareTo(end) == -1) { count = count + 1; date.addDays(1); }