|
119 | 119 | /** |
120 | 120 | * Retrieve data |
121 | 121 | */ |
| 122 | + $.ajaxSetup({ scriptCharset: "utf-8" , contentType: "application/json; charset=utf-8"}); |
122 | 123 | $.getJSON(settings.source, function(jsData) { |
123 | 124 | element.data = jsData; |
124 | 125 | core.init(element); |
|
264 | 265 |
|
265 | 266 | var today = new Date(); |
266 | 267 | 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() : ''; |
268 | 269 |
|
269 | 270 | switch (settings.scale) |
270 | 271 | { |
|
405 | 406 | var todayCls = gridDowClass[day.getDay()]; |
406 | 407 | if (hollydays.indexOf((new Date(day.getFullYear(), day.getMonth(), day.getDate())).getTime())>-1) |
407 | 408 | 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>'; |
409 | 410 | }; |
410 | 411 | //dataPanel.append(dRow); |
411 | | - dataPanel.html(dataPanel.html()+dRow); |
| 412 | + dataPanel.html(dataPanel.html()+dRow+'</div>'); |
412 | 413 | } |
413 | 414 | } |
414 | 415 |
|
|
504 | 505 | day = range[x]; |
505 | 506 | dRow += '<div class="row day" id="d'+i+'-'+ tools.genId( day.getTime() ) +'"></div>'; |
506 | 507 | }; |
507 | | - dataPanel.append(dRow); |
| 508 | + dataPanel.append($(dRow+'</div>')); |
508 | 509 | } |
509 | 510 | } |
510 | 511 |
|
|
573 | 574 | for (var i=0; i<element.data.length; i++) |
574 | 575 | { |
575 | 576 | var entry = element.data[i]; |
576 | | - |
| 577 | + |
577 | 578 | if (i >= element.pageNum*settings.itemsPerPage && i < (element.pageNum*settings.itemsPerPage+settings.itemsPerPage)) |
578 | 579 | { |
579 | 580 | var dRow = '<div class="row">'; |
580 | 581 | for (var x=0; x<range.length; x++) |
581 | 582 | { |
582 | 583 | 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>'; |
584 | 585 | }; |
585 | | - dataPanel.append(dRow); |
| 586 | + dataPanel.append($(dRow+'</div>')); |
586 | 587 | } |
587 | 588 | } |
588 | 589 |
|
|
686 | 687 | todayCls = " hollyday"; |
687 | 688 | dRow += '<div class="row day ' + todayCls + '" id="d'+i+'-'+ tools.genId( day.getTime() ) +'"></div>'; |
688 | 689 | }; |
689 | | - dataPanel.append(dRow); |
| 690 | + dataPanel.append($(dRow+'</div>')); |
690 | 691 | } |
691 | 692 | } |
692 | 693 |
|
693 | 694 | break; |
694 | 695 | } |
695 | 696 |
|
696 | | - return $('<div class="rightPanel"/>').append(dataPanel); |
| 697 | + return $('<div class="rightPanel"></div>').append(dataPanel); |
697 | 698 | }, |
698 | 699 | navigation: function (element) { |
699 | 700 | var ganttNavigate = null; |
|
912 | 913 | .append(_bar); |
913 | 914 | break; |
914 | 915 | case 'weeks': |
915 | | - case 'months': |
| 916 | + case 'months': |
916 | 917 | var dFrom = tools.genId(tools.dateDeserialize(day.from).getTime()); |
917 | 918 | var dTo = tools.genId(tools.dateDeserialize(day.to).getTime()); |
918 | 919 | var cFrom = $(element).find('#d'+i+'-'+ dFrom).offset().left; |
|
0 commit comments