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

Added language specific messages to the loading event

pull/75/head
Zach Wise 13 years ago
parent
d7884f0c7e
commit
e1c0998449
17 changed files with 61 additions and 61 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. 4
      locale/de.js
  2. 4
      locale/en.js
  3. 4
      locale/es.js
  4. 4
      locale/fr.js
  5. 4
      locale/is.js
  6. 4
      locale/it.js
  7. 4
      locale/kr.js
  8. 4
      locale/nl.js
  9. 4
      locale/pt-br.js
  10. 4
      locale/zh-ch.js
  11. 4
      locale/zh-tw.js
  12. 28
      source/js/VMM.ExternalAPI.js
  13. 4
      source/js/VMM.Timeline.DataObj.js
  14. 4
      source/js/VMM.Timeline.js
  15. 2
      source/js/locale/es.js
  16. 4
      timeline-min.js
  17. 36
      timeline.js

4
locale/de.js
View File

File diff suppressed because one or more lines are too long

4
locale/en.js
View File

File diff suppressed because one or more lines are too long

4
locale/es.js
View File

File diff suppressed because one or more lines are too long

4
locale/fr.js
View File

File diff suppressed because one or more lines are too long

4
locale/is.js
View File

File diff suppressed because one or more lines are too long

4
locale/it.js
View File

File diff suppressed because one or more lines are too long

4
locale/kr.js
View File

File diff suppressed because one or more lines are too long

4
locale/nl.js
View File

File diff suppressed because one or more lines are too long

4
locale/pt-br.js
View File

File diff suppressed because one or more lines are too long

4
locale/zh-ch.js
View File

File diff suppressed because one or more lines are too long

4
locale/zh-tw.js
View File

File diff suppressed because one or more lines are too long

28
source/js/VMM.ExternalAPI.js
Unescape View File

@ -525,27 +525,27 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
// VMM.ExternalAPI.youtube.createPlayer(id);
createPlayer: function(id) {
var p = {
active:false,
player: {},
name:'youtube_'+id,
playing:false
active: false,
player: {},
name: 'youtube_'+id,
playing: false
};
p.player['youtube_'+id] = new YT.Player('youtube_'+id, {
height: '390',
width: '640',
height: '390',
width: '640',
playerVars: {
enablejsapi:1,
color: 'white',
showinfo:0,
theme: 'light',
rel:0,
origin:'http://timeline.verite.co'
enablejsapi: 1,
color: 'white',
showinfo: 0,
theme: 'light',
rel: 0,
origin: 'http://timeline.verite.co'
},
videoId: id,
events: {
'onReady': VMM.ExternalAPI.youtube.onPlayerReady,
'onStateChange': VMM.ExternalAPI.youtube.onStateChange
'onReady': VMM.ExternalAPI.youtube.onPlayerReady,
'onStateChange': VMM.ExternalAPI.youtube.onStateChange
}
});

4
source/js/VMM.Timeline.DataObj.js
Unescape View File

@ -22,12 +22,12 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
VMM.Timeline.DataObj.model_Tweets.getData("%23medill");
} else if ( raw_data.match("spreadsheet") ) {
VMM.fireEvent(global, "MESSEGE", "Loading Data");
VMM.fireEvent(global, "MESSEGE", VMM.Timeline.Config.language.messages.loading_timeline);
trace("DATA SOURCE: GOOGLE SPREADSHEET");
VMM.Timeline.DataObj.model_GoogleSpreadsheet.getData(raw_data);
} else {
VMM.fireEvent(global, "MESSEGE", "Loading Data");
VMM.fireEvent(global, "MESSEGE", VMM.Timeline.Config.language.messages.loading_timeline);
trace("DATA SOURCE: JSON");
VMM.getJSON(raw_data, VMM.Timeline.DataObj.parseJSON);
}

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

@ -1,6 +1,6 @@
/*!
Timeline
Designed and built by Zach Wise at VeriteCo
Designed and built by Zach Wise at VéritéCo
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -57,7 +57,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline";
}
version = "0.98.71";
version = "0.98.72";
trace("TIMELINE VERSION " + version);

2
source/js/locale/es.js
Unescape View File

@ -22,7 +22,7 @@ if(typeof VMM != 'undefined') {
full_long_small_date: "HH:MM'<br/><small>'dddd',' d mmm yyyy'</small>'"
},
messages: {
loading_timeline: "Cargando... ",
loading_timeline: "Cronología esta cargando",
return_to_title: "Volver al título",
expand_timeline: "Enlargar la cronología",
contract_timeline: "Reducir la cronología"

4
timeline-min.js vendored
View File

File diff suppressed because one or more lines are too long

36
timeline.js
Unescape View File

@ -2758,27 +2758,27 @@ if(typeof VMM != 'undefined' && typeof VMM.ExternalAPI == 'undefined') {
// VMM.ExternalAPI.youtube.createPlayer(id);
createPlayer: function(id) {
var p = {
active:false,
player: {},
name:'youtube_'+id,
playing:false
active: false,
player: {},
name: 'youtube_'+id,
playing: false
};
p.player['youtube_'+id] = new YT.Player('youtube_'+id, {
height: '390',
width: '640',
height: '390',
width: '640',
playerVars: {
enablejsapi:1,
color: 'white',
showinfo:0,
theme: 'light',
rel:0,
origin:'http://timeline.verite.co'
enablejsapi: 1,
color: 'white',
showinfo: 0,
theme: 'light',
rel: 0,
origin: 'http://timeline.verite.co'
},
videoId: id,
events: {
'onReady': VMM.ExternalAPI.youtube.onPlayerReady,
'onStateChange': VMM.ExternalAPI.youtube.onStateChange
'onReady': VMM.ExternalAPI.youtube.onPlayerReady,
'onStateChange': VMM.ExternalAPI.youtube.onStateChange
}
});
@ -4801,7 +4801,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Language == 'undefined') {
/*!
Timeline
Designed and built by Zach Wise at VeriteCo
Designed and built by Zach Wise at VéritéCo
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -4858,7 +4858,7 @@ if(typeof VMM != 'undefined' && typeof VMM.Timeline == 'undefined') {
timeline_id = "#timeline";
}
version = "0.98.71";
version = "0.98.72";
trace("TIMELINE VERSION " + version);
@ -6531,12 +6531,12 @@ if(typeof VMM.Timeline != 'undefined' && typeof VMM.Timeline.DataObj == 'undefin
VMM.Timeline.DataObj.model_Tweets.getData("%23medill");
} else if ( raw_data.match("spreadsheet") ) {
VMM.fireEvent(global, "MESSEGE", "Loading Data");
VMM.fireEvent(global, "MESSEGE", VMM.Timeline.Config.language.messages.loading_timeline);
trace("DATA SOURCE: GOOGLE SPREADSHEET");
VMM.Timeline.DataObj.model_GoogleSpreadsheet.getData(raw_data);
} else {
VMM.fireEvent(global, "MESSEGE", "Loading Data");
VMM.fireEvent(global, "MESSEGE", VMM.Timeline.Config.language.messages.loading_timeline);
trace("DATA SOURCE: JSON");
VMM.getJSON(raw_data, VMM.Timeline.DataObj.parseJSON);
}

Write Preview
Loading…
Cancel
Save