Merge branch 'master' of gitlab.com:hugvey/hugvey

This commit is contained in:
Ruben van de Ven 2019-05-11 23:34:18 +02:00
commit 08e3805819
3 changed files with 25 additions and 7 deletions

View file

@ -9,5 +9,5 @@ cutelog
tornado tornado
shortuuid shortuuid
python-osc python-osc
sox

View file

@ -38,14 +38,31 @@ class Timeline{
startDate.setMinutes(startDate.getMinutes()-1); startDate.setMinutes(startDate.getMinutes()-1);
let endDate = new Date(); let endDate = new Date();
endDate.setMinutes(endDate.getMinutes()+20); endDate.setMinutes(endDate.getMinutes()+20);
setTimeout(function(){
tl.setWindow(startDate, endDate);
}, 500);
//follow the timeline or not if checkbox is checked
setTimeout(function(){
tl.setWindow(startDate, endDate);
}, 500);
this.moveInterval = setInterval(function(){
// skip movement if not visible
tl.moveTo(new Date());
}, 1000);
var checkbox = document.getElementById('follow_checkbox')
checkbox.addEventListener('change', (event) => {
if (event.target.checked) {
this.moveInterval = setInterval(function(){ this.moveInterval = setInterval(function(){
// skip movement if not visible // skip movement if not visible
tl.moveTo(new Date()); tl.moveTo(new Date());
}, 1000); }, 1000);
} else {
clearInterval(this.moveInterval)
}
})
ws.addEventListener( 'message', this); ws.addEventListener( 'message', this);

View file

@ -31,7 +31,7 @@
background-color: greenyellow; background-color: greenyellow;
border-color: green; border-color: green;
} }
.vis-text,.vis-labelset .vis-label { .vis-text,.vis-labelset .vis-label {
color: #999; color: #999;
} }
@ -71,8 +71,9 @@ font-size: 4.5pt;
</style> </style>
</head> </head>
<body id='timeline'> <body id='timeline'>
<input id="follow_checkbox" type="checkbox" name="follow" value="follow" checked> Follow timeline<br>
<div id='line'></div> <div id='line'></div>
<script type='application/javascript' src="/js/hugvey_timeline.js"></script> <script type='application/javascript' src="/js/hugvey_timeline.js"></script>
</body> </body>
</html> </html>