Browse Source

Latest compile 2.15

pull/246/head
Zach Wise 12 years ago
parent
commit
4405dfa3e0
  1. 6
      compiled/js/timeline-min.js
  2. 7
      compiled/js/timeline.js
  3. 2
      source/js/VMM.Timeline.License.js
  4. 5
      source/js/VMM.Timeline.js

6
compiled/js/timeline-min.js vendored

File diff suppressed because one or more lines are too long

7
compiled/js/timeline.js

@ -1,6 +1,6 @@
/*! /*!
TimelineJS TimelineJS
Version 2.14 Version 2.15
Designed and built by Zach Wise at VéritéCo Designed and built by Zach Wise at VéritéCo
This Source Code Form is subject to the terms of the Mozilla Public This Source Code Form is subject to the terms of the Mozilla Public
@ -6949,10 +6949,13 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
}; };
this.reload = function(_d) { this.reload = function(_d) {
trace("loadNewDates" + _d); trace("Load new timeline data" + _d);
VMM.fireEvent(global, config.events.messege, config.language.messages.loading_timeline); VMM.fireEvent(global, config.events.messege, config.language.messages.loading_timeline);
data = {}; data = {};
VMM.Timeline.DataObj.getData(_d); VMM.Timeline.DataObj.getData(_d);
config.current_slide = 0;
slider.setSlide(0);
timenav.setMarker(0, config.ease,config.duration);
}; };
/* DATA /* DATA

2
source/js/VMM.Timeline.License.js

@ -1,6 +1,6 @@
/*! /*!
TimelineJS TimelineJS
Version 2.14 Version 2.15
Designed and built by Zach Wise at VéritéCo Designed and built by Zach Wise at VéritéCo
This Source Code Form is subject to the terms of the Mozilla Public This Source Code Form is subject to the terms of the Mozilla Public

5
source/js/VMM.Timeline.js

@ -449,10 +449,13 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
}; };
this.reload = function(_d) { this.reload = function(_d) {
trace("loadNewDates" + _d); trace("Load new timeline data" + _d);
VMM.fireEvent(global, config.events.messege, config.language.messages.loading_timeline); VMM.fireEvent(global, config.events.messege, config.language.messages.loading_timeline);
data = {}; data = {};
VMM.Timeline.DataObj.getData(_d); VMM.Timeline.DataObj.getData(_d);
config.current_slide = 0;
slider.setSlide(0);
timenav.setMarker(0, config.ease,config.duration);
}; };
/* DATA /* DATA

Loading…
Cancel
Save