Changeset 1135

Timestamp:

04/25/10 15:59:20 (2 years ago)

Author:

victorsb

Message:

Changed RoundTimer? macro to use server time instead of local time.

REVIEW URL: ​http://reviewboard.infoarena.ro/r/155/

Location:

trunk/www

Files:

• macros/macro_roundtimer.php (modified) (1 diff)
• static/js/roundtimer.js (modified) (2 diffs)

trunk/www/macros/macro_roundtimer.php

@@ -75 +75 @@
     $html .= 'newRoundTimer(' .
         '"' . html_escape($timer_id) . '"' .
+        ',"' . html_escape(format_date(time(), "%Y/%m/%d %H:%M:%S %z")) . '"' .
         ',"' . html_escape(format_date($round['start_time'],
                                         "%Y/%m/%d %H:%M:%S %z")) . '"' .

trunk/www/static/js/roundtimer.js

@@ -4 +4 @@
     var now = new Date();
 
-    var diff = timers[timerId].startTime.getTime() - now.getTime();
+    var diff = timers[timerId].startTime.getTime() +
+               timers[timerId].timeDifference -
+               now.getTime();
     diff = (diff - diff % 1000) / 1000;
 
@@ -95 +97 @@
 }
 
-function newRoundTimer(timerId, startTime, duration, units, showMessage) {
+function newRoundTimer(timerId, serverTime, startTime,
+                        duration, units, showMessage) {
     timers[timerId] = {};
+    timers[timerId].timeDifference = (new Date()).getTime() -
+                                     (new Date(serverTime)).getTime();
     timers[timerId].startTime = new Date(startTime);
     timers[timerId].duration = duration * 3600;