Skip to content

Commit 1a9711f

Browse files
committed
Fix for mbielanczuk#11 IE8 error
1 parent 52f46db commit 1a9711f

File tree

2 files changed

+12
-11
lines changed

2 files changed

+12
-11
lines changed

js/jquery.fn.gantt.js

100644100755
Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,7 @@
119119
/**
120120
* Retrieve data
121121
*/
122+
$.ajaxSetup({ scriptCharset: "utf-8" , contentType: "application/json; charset=utf-8"});
122123
$.getJSON(settings.source, function(jsData) {
123124
element.data = jsData;
124125
core.init(element);
@@ -264,7 +265,7 @@
264265

265266
var today = new Date();
266267
today = new Date(today.getFullYear(), today.getMonth(), today.getDate());
267-
var hollydays = settings.hollydays ? settings.hollydays.join() : '';
268+
var hollydays = settings.holidays ? settings.holidays.join() : '';
268269

269270
switch (settings.scale)
270271
{
@@ -405,10 +406,10 @@
405406
var todayCls = gridDowClass[day.getDay()];
406407
if (hollydays.indexOf((new Date(day.getFullYear(), day.getMonth(), day.getDate())).getTime())>-1)
407408
todayCls = " hollyday";
408-
dRow += '<div class="row day' + todayCls + '" id="d'+i+'-'+ tools.genId( day.getTime() ) +'" /></div>';
409+
dRow += '<div class="row day' + todayCls + '" id="d'+i+'-'+ tools.genId( day.getTime() ) +'" ></div>';
409410
};
410411
//dataPanel.append(dRow);
411-
dataPanel.html(dataPanel.html()+dRow);
412+
dataPanel.html(dataPanel.html()+dRow+'</div>');
412413
}
413414
}
414415

@@ -504,7 +505,7 @@
504505
day = range[x];
505506
dRow += '<div class="row day" id="d'+i+'-'+ tools.genId( day.getTime() ) +'"></div>';
506507
};
507-
dataPanel.append(dRow);
508+
dataPanel.append($(dRow+'</div>'));
508509
}
509510
}
510511

@@ -573,16 +574,16 @@
573574
for (var i=0; i<element.data.length; i++)
574575
{
575576
var entry = element.data[i];
576-
577+
577578
if (i >= element.pageNum*settings.itemsPerPage && i < (element.pageNum*settings.itemsPerPage+settings.itemsPerPage))
578579
{
579580
var dRow = '<div class="row">';
580581
for (var x=0; x<range.length; x++)
581582
{
582583
day = range[x];
583-
dRow += '<div class="row day" id="d'+i+'-'+ tools.genId( day.getTime() ) +'" /></div>';
584+
dRow += '<div class="row day" id="d'+i+'-'+ tools.genId( day.getTime() ) +'" ></div>';
584585
};
585-
dataPanel.append(dRow);
586+
dataPanel.append($(dRow+'</div>'));
586587
}
587588
}
588589

@@ -686,14 +687,14 @@
686687
todayCls = " hollyday";
687688
dRow += '<div class="row day ' + todayCls + '" id="d'+i+'-'+ tools.genId( day.getTime() ) +'"></div>';
688689
};
689-
dataPanel.append(dRow);
690+
dataPanel.append($(dRow+'</div>'));
690691
}
691692
}
692693

693694
break;
694695
}
695696

696-
return $('<div class="rightPanel"/>').append(dataPanel);
697+
return $('<div class="rightPanel"></div>').append(dataPanel);
697698
},
698699
navigation: function (element) {
699700
var ganttNavigate = null;
@@ -912,7 +913,7 @@
912913
.append(_bar);
913914
break;
914915
case 'weeks':
915-
case 'months':
916+
case 'months':
916917
var dFrom = tools.genId(tools.dateDeserialize(day.from).getTime());
917918
var dTo = tools.genId(tools.dateDeserialize(day.to).getTime());
918919
var cFrom = $(element).find('#d'+i+'-'+ dFrom).offset().left;

0 commit comments

Comments
 (0)