ag-admin/OpenSlides
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3138 from FinnStutzenstein/CountdownBug

Browse Source 
Fixing countdown default time
This commit is contained in:
Norman Jäckel 2017-03-24 14:50:35 +01:00 committed by GitHub
commit 4964c2e84e
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
openslides/core/static/js/core/base.js
View File

@ -1045,7 +1045,10 @@ angular.module('OpenSlidesApp.core', [
data = 0;
if (time.length >= minLength) {
for (var i = 0; i < minLength; i++) {
data = data*60 + (+time[i]);
data = data*60;
if (!isNaN(+time[i])) {
data += (+time[i]);
}
}
if (!params.seconds) { // the last field was minutes (e.g. h:mm)
data *= 60;