Browse Source

fix nothing?callback error

pull/814/head
gotjosh 10 years ago
parent
commit
158848a44d
  1. 6
      build/js/timeline.js

6
build/js/timeline.js

@ -531,7 +531,9 @@ if(typeof VMM != 'undefined') {
var colon = url.indexOf(':');
url = url.substr(colon+1);
}
return jQuery.getJSON(url, data, callback);
return jQuery.ajax(url, data, callback);
//JSG 2015.Aug.24 changed from getJSON to ajax based on:
//http://stackoverflow.com/questions/1002367/jquery-ajax-jsonp-ignores-a-timeout-and-doesnt-fire-the-error-event
}
}
@ -7349,7 +7351,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
createConfig(c);
createStructure();
if (type.of(_data) == "string") {
if (type.of(_data) == "string" || type.of(_data) == "object") {
config.source = _data;
}

Loading…
Cancel
Save