bachir/HeHe-Centiped
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated ui and script BUGY

Browse Source
This commit is contained in:
Bachir Soussi Chiadmi
2016-06-30 23:53:33 +02:00
parent 7a3a72b7dc
commit 94b8d8f31e
7 changed files with 94 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files
www/public_html/js/dist/script.min.js
Vendored
+4
View File
@@ -0,0 +1,4 @@
$(document).ready(function(){var _timeline,_timeline_container=document.getElementById('timeline'),_tl_data_ar;function init(){console.log("Init");getMetaData();setupTimeline();};function getMetaData(){console.log('getMetaData');$.ajax({dataType:"json",url:'metadata/frames.json',success:setUpData});console.log('getMetaData END');};function setUpData(data){console.log("setUpData");console.log("data",data);var frame;for(var i in data.frames){console.log(data.frames[i]);_tl_data_ar.push({start:data.frames[i],end:,});}};function setupTimeline(){var items=new vis.DataSet([{id:1,content:'item 1',start:'2016-06-20'},{id:2,content:'item 2',start:'2016-06-14'},{id:3,content:'item 3',start:'2016-06-18'},{id:4,content:'item 4',start:'2016-06-16',end:'2015-06-19'},{id:5,content:'item 5',start:'2016-06-25'},{id:6,content:'item 6',start:'2016-06-27',type:'point'}]);_timeline=new vis.Timeline(_timeline_container,items,{});}
function play(millis){requestAnimationFrame(play);}
init();});
www/public_html/js/script.js
+59 -13
View File
@@ -1,27 +1,73 @@
$(document).ready(function() {
var fps = 2, now, then = Date.now(), interval = 1000/fps, delta;
var _timeline, _timeline_container = document.getElementById('timeline'), _tl_data_ar;
function init(){
console.log("Init");
// preload all pictures before launching
setTimeout(function(){
play();
}, 5000);
// setTimeout(function(){
// play();
// }, 5000);
getMetaData();
setupTimeline();
};
function getMetaData(){
console.log('getMetaData');
// $.getJSON('metadata/frame.json',function(data){
// setUpData(data.frames)
// });
$.ajax({
dataType:"json",
url:'metadata/frames.json',
success:setUpData
});
console.log('getMetaData END');
};
function setUpData(data){
console.log("setUpData");
console.log("data", data);
var frame;
for (var i in data.frames) {
console.log(data.frames[i]);
_tl_data_ar.push({
start:data.frames[i],
end:,
});
}
};
function setupTimeline(){
// Create a DataSet (allows two way data-binding)
var items = new vis.DataSet([
{id: 1, content: 'item 1', start: '2016-06-20'},
{id: 2, content: 'item 2', start: '2016-06-14'},
{id: 3, content: 'item 3', start: '2016-06-18'},
{id: 4, content: 'item 4', start: '2016-06-16', end: '2015-06-19'},
{id: 5, content: 'item 5', start: '2016-06-25'},
{id: 6, content: 'item 6', start: '2016-06-27', type: 'point'}
]);
// Configuration for the Timeline
// var options = {};
// Create a Timeline
_timeline = new vis.Timeline(_timeline_container, items, {});
}
function play(millis){
requestAnimationFrame(play);
now = Date.now();
delta = now - then;
if(delta > interval){
$(".frame.current", "#pictures").toggleClass('current').next().toggleClass('current');
then = now -(delta % interval);
}
// now = Date.now();
// delta = now - then;
//
// if(delta > interval){
// then = now -(delta % interval);
// }
}