playground
/
TimelineJS
mirror of https://github.com/NUKnightLab/TimelineJS.git
1
0
Fork 0
Code Issues Releases Activity
Browse Source

Fix for incorrect date string on slide or navigation

pull/90/merge
Zach Wise 13 years ago
parent
d9872475f1
commit
8fe57ecb3a
16 changed files with 62 additions and 58 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      locale/de.js
  2. 6
      locale/en.js
  3. 6
      locale/es.js
  4. 6
      locale/fr.js
  5. 6
      locale/is.js
  6. 6
      locale/it.js
  7. 6
      locale/kr.js
  8. 6
      locale/nl.js
  9. 6
      locale/pt-br.js
  10. 6
      locale/zh-ch.js
  11. 6
      locale/zh-tw.js
  12. 4
      source/js/VMM.Slider.Slide.js
  13. 4
      source/js/VMM.Slider.js
  14. 18
      source/js/VMM.Timeline.js
  15. 6
      timeline-min.js
  16. 22
      timeline.js

6
locale/de.js
View File

File diff suppressed because one or more lines are too long

6
locale/en.js
View File

File diff suppressed because one or more lines are too long

6
locale/es.js
View File

File diff suppressed because one or more lines are too long

6
locale/fr.js
View File

File diff suppressed because one or more lines are too long

6
locale/is.js
View File

File diff suppressed because one or more lines are too long

6
locale/it.js
View File

File diff suppressed because one or more lines are too long

6
locale/kr.js
View File

File diff suppressed because one or more lines are too long

6
locale/nl.js
View File

File diff suppressed because one or more lines are too long

6
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

6
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

6
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

4
source/js/VMM.Slider.Slide.js
Unescape View File

@ -84,8 +84,8 @@ if (typeof VMM.Slider != 'undefined') {
if (data.startdate != null && data.startdate != "") {
if (type.of(data.startdate) == "date") {
if (data.type != "start") {
var st = VMM.Util.date.prettyDate(data.startdate);
var en = VMM.Util.date.prettyDate(data.enddate);
var st = data.startdate_str;
var en = data.enddate_str;
if (st != en) {
c.text += VMM.createElement("h2", st + " — " + en + "", "date");
} else {

4
source/js/VMM.Slider.js
Unescape View File

@ -495,7 +495,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.attachElement(navigation.prevDate, _title);
VMM.attachElement(navigation.prevTitle, "");
} else {
VMM.attachElement(navigation.prevDate, data[current_slide - 1].date);
VMM.attachElement(navigation.prevDate, data[current_slide - 1].startdate_str);
VMM.attachElement(navigation.prevTitle, _title);
}
} else {
@ -513,7 +513,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Slider == 'undefined') {
VMM.attachElement(navigation.nextDate, _title);
VMM.attachElement(navigation.nextTitle, "");
} else {
VMM.attachElement(navigation.nextDate, data[current_slide + 1].date);
VMM.attachElement(navigation.nextDate, data[current_slide + 1].startdate_str);
VMM.attachElement(navigation.nextTitle, _title);
}
} else {

18
source/js/VMM.Timeline.js
Unescape View File

@ -435,14 +435,16 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
_date.enddate = _date.startdate;
}
_date.title = data.date[i].headline;
_date.headline = data.date[i].headline;
_date.type = data.date[i].type;
_date.date = VMM.Util.date.prettyDate(_date.startdate);
_date.asset = data.date[i].asset;
_date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
_date.title = data.date[i].headline;
_date.headline = data.date[i].headline;
_date.type = data.date[i].type;
_date.date = VMM.Util.date.prettyDate(_date.startdate);
_date.startdate_str = VMM.Util.date.prettyDate(_date.startdate);
_date.enddate_str = VMM.Util.date.prettyDate(_date.enddate);
_date.asset = data.date[i].asset;
_date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
_dates.push(_date);

6
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

22
timeline.js
Unescape View File

@ -3245,8 +3245,8 @@ if (typeof VMM.Slider != 'undefined') {
if (data.startdate != null && data.startdate != "") {
if (type.of(data.startdate) == "date") {
if (data.type != "start") {
var st = VMM.Util.date.prettyDate(data.startdate);
var en = VMM.Util.date.prettyDate(data.enddate);
var st = data.startdate_str;
var en = data.enddate_str;
if (st != en) {
c.text += VMM.createElement("h2", st + " — " + en + "", "date");
} else {
@ -5819,14 +5819,16 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
_date.enddate = _date.startdate;
}
_date.title = data.date[i].headline;
_date.headline = data.date[i].headline;
_date.type = data.date[i].type;
_date.date = VMM.Util.date.prettyDate(_date.startdate);
_date.asset = data.date[i].asset;
_date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
_date.title = data.date[i].headline;
_date.headline = data.date[i].headline;
_date.type = data.date[i].type;
_date.date = VMM.Util.date.prettyDate(_date.startdate);
_date.startdate_str = VMM.Util.date.prettyDate(_date.startdate);
_date.enddate_str = VMM.Util.date.prettyDate(_date.enddate);
_date.asset = data.date[i].asset;
_date.fulldate = _date.startdate.getTime();
_date.text = data.date[i].text;
_date.content = "";
_dates.push(_date);

Write Preview
Loading…
Cancel
Save