Browse Source

Detritus

pull/162/head
Zach Wise 13 years ago
parent
commit
4ec010fd51
  1. 1
      source/js/Core/VMM.Date.js
  2. 2
      source/js/VMM.Timeline.DataObj.js

1
source/js/Core/VMM.Date.js

@ -56,6 +56,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Date == 'undefined') {
return d;
} else {
var _date = new Date(0, 0, 1, 0, 0, 0, 0);
//var _date = new Date("January 1, 0000 00:00:00")
var _d_array, _t_array;
var _time_parse, _times;

2
source/js/VMM.Timeline.DataObj.js

@ -141,7 +141,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
},
parseJSON: function(d) {
trace(d);
trace("parseJSON");
if (d.timeline.type == "default") {
trace("DATA SOURCE: JSON STANDARD TIMELINE");
VMM.fireEvent(global, VMM.Timeline.Config.events.data_ready, d);

Loading…
Cancel
Save