Browse Source

Should work. closes #89

pull/127/head
Zach Wise 13 years ago
parent
commit
d836b8a501
  1. 4
      compiled/js/locale/de.js
  2. 4
      compiled/js/locale/en.js
  3. 4
      compiled/js/locale/es.js
  4. 4
      compiled/js/locale/fr.js
  5. 4
      compiled/js/locale/is.js
  6. 4
      compiled/js/locale/it.js
  7. 4
      compiled/js/locale/kr.js
  8. 4
      compiled/js/locale/nl.js
  9. 4
      compiled/js/locale/pt-br.js
  10. 4
      compiled/js/locale/zh-ch.js
  11. 4
      compiled/js/locale/zh-tw.js
  12. 4
      compiled/js/timeline-min.js
  13. 16
      compiled/js/timeline.js
  14. 3
      source/js/VMM.Timeline.DataObj.js
  15. 1
      source/js/VMM.Timeline.js
  16. 7
      source/js/timeline-embed.js

4
compiled/js/locale/de.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/en.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/es.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/fr.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/is.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/it.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/kr.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/nl.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/pt-br.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/zh-ch.js

File diff suppressed because one or more lines are too long

4
compiled/js/locale/zh-tw.js

File diff suppressed because one or more lines are too long

4
compiled/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

16
compiled/js/timeline.js

@ -5702,7 +5702,8 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
================================================== */
function onDataReady(e, d) {
trace("onDataReady");
trace(d);
data = d.timeline;
if (type.of(data.era) == "array") {
@ -5803,7 +5804,6 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
VMM.fireEvent(global, "MESSEGE", "Internet Explorer 7 is not supported by #Timeline.");
} else {
if (type.of(_data) == "string" || type.of(_data) == "object") {
trace("GET DATA 1")
VMM.Timeline.DataObj.getData(_data);
} else {
VMM.Timeline.DataObj.getData(VMM.getElement(timeline_id));
@ -5816,6 +5816,13 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
trace("iframeLoaded");
};
this.reload = function(_d) {
trace("loadNewDates" + _d);
$messege = VMM.appendAndGetElement($feedback, "<div>", "messege", VMM.Timeline.Config.language.messages.loading_timeline);
data = {};
VMM.Timeline.DataObj.getData(_d);
}
/* DATA
================================================== */
var getData = function(url) {
@ -5889,7 +5896,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
var buildDates = function() {
updateSize();
_dates = [];
VMM.fireEvent(global, "MESSEGE", "Building Dates");
for(var i = 0; i < data.date.length; i++) {
@ -7126,7 +7133,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
model_array: [],
getData: function(raw_data) {
VMM.Timeline.DataObj.data_obj = {};
data = VMM.Timeline.DataObj.data_obj;
if (type.of(raw_data) == "object") {
@ -7145,6 +7152,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
} else {
VMM.fireEvent(global, "MESSEGE", VMM.Timeline.Config.language.messages.loading_timeline);
trace("DATA SOURCE: JSON");
trace("raw data" + raw_data);
VMM.getJSON(raw_data, VMM.Timeline.DataObj.parseJSON);
}
} else if (type.of(raw_data) == "html") {

3
source/js/VMM.Timeline.DataObj.js

@ -10,7 +10,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
model_array: [],
getData: function(raw_data) {
VMM.Timeline.DataObj.data_obj = {};
data = VMM.Timeline.DataObj.data_obj;
if (type.of(raw_data) == "object") {
@ -29,6 +29,7 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
} else {
VMM.fireEvent(global, "MESSEGE", VMM.Timeline.Config.language.messages.loading_timeline);
trace("DATA SOURCE: JSON");
trace("raw data" + raw_data);
VMM.getJSON(raw_data, VMM.Timeline.DataObj.parseJSON);
}
} else if (type.of(raw_data) == "html") {

1
source/js/VMM.Timeline.js

@ -334,6 +334,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
trace("iframeLoaded");
};
this.reload = function(_d) {
/* DATA
================================================== */
var getData = function(url) {

7
source/js/timeline-embed.js

@ -109,7 +109,7 @@
var isReady = false;
var preload_checks = 0;
var timeout;
var timeline;
var timelinejs;
/* Add Timeline Div
================================================== */
@ -270,8 +270,9 @@
if (jsReady && cssReady && fontCSSReady && fontJSReady) {
if (!isReady) {
isReady = true;
timeline = new VMM.Timeline();
timeline.init(embed_config.source);
timelinejs = new VMM.Timeline();
timelinejs.init(embed_config.source);
}
} else {
//alert("run timeout");

Loading…
Cancel
Save