From bfe70469d05e2028274b779083d20737483a5b6a Mon Sep 17 00:00:00 2001 From: Exodus4D Date: Mon, 1 Aug 2016 20:15:41 +0200 Subject: [PATCH] - fixed eol timer bug for new connections, closed #172 --- js/app/util.js | 12 +++++++++++- public/js/v1.1.3/app/util.js | 12 +++++++++++- 2 files changed, 22 insertions(+), 2 deletions(-) diff --git a/js/app/util.js b/js/app/util.js index 5232737d..91234e44 100644 --- a/js/app/util.js +++ b/js/app/util.js @@ -889,7 +889,17 @@ define([ */ var getTimeDiffParts = function(date1, date2){ var parts = {}; - var diff = (date2.getTime() - date1.getTime()) / 1000; + var time1 = date1.getTime(); + var time2 = date2.getTime(); + var diff = 0; + + if( + time1 >= 0 && + time2 >= 0 + ){ + diff = (date2.getTime() - date1.getTime()) / 1000; + } + diff = Math.abs(Math.floor(diff)); parts.days = Math.floor(diff/(24*60*60)); diff --git a/public/js/v1.1.3/app/util.js b/public/js/v1.1.3/app/util.js index 5232737d..91234e44 100644 --- a/public/js/v1.1.3/app/util.js +++ b/public/js/v1.1.3/app/util.js @@ -889,7 +889,17 @@ define([ */ var getTimeDiffParts = function(date1, date2){ var parts = {}; - var diff = (date2.getTime() - date1.getTime()) / 1000; + var time1 = date1.getTime(); + var time2 = date2.getTime(); + var diff = 0; + + if( + time1 >= 0 && + time2 >= 0 + ){ + diff = (date2.getTime() - date1.getTime()) / 1000; + } + diff = Math.abs(Math.floor(diff)); parts.days = Math.floor(diff/(24*60*60));