Merge branch 'master' of git@github.com:280north/cappuccino

280north · Dec 10, 2008 · b87493b · b87493b
2 parents 6925bfd + 2d9d9f3
commit b87493b
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/Foundation/CPRunLoop.j b/Foundation/CPRunLoop.j
@@ -151,6 +151,7 @@ var CPRunLoopLastNativeRunLoop = 0;
     Object  _nativeTimersForModes;
     CPDate  _nextTimerFireDatesForModes;
     BOOL    _didAddTimer;
+    CPDate  _effectiveDate;
 
     CPArray _orderedPerforms;
 }
@@ -276,7 +277,7 @@ var CPRunLoopLastNativeRunLoop = 0;
 
     _runLoopLock = YES;
 
-    var now = [CPDate date],
+    var now = _effectiveDate ? [_effectiveDate laterDate:[CPDate date]] : [CPDate date],
         nextFireDate = nil,
         nextTimerFireDate = _nextTimerFireDatesForModes[aMode];
 
@@ -348,7 +349,7 @@ var CPRunLoopLastNativeRunLoop = 0;
 
         //initiate a new window.setTimeout if there are any timers
         if (_nextTimerFireDatesForModes[aMode] !== nil)
-            _nativeTimersForModes[aMode] = window.setNativeTimeout(function() { _nativeTimersForModes[aMode] = nil; ++CPRunLoopLastNativeRunLoop; [self limitDateForMode:aMode]; _isNativeTimerRun = NO; }, MAX(0, [nextFireDate timeIntervalSinceNow] * 1000));
+            _nativeTimersForModes[aMode] = window.setNativeTimeout(function() { _effectiveDate = nextFireDate; _nativeTimersForModes[aMode] = nil; ++CPRunLoopLastNativeRunLoop; [self limitDateForMode:aMode]; _effectiveDate = nil; }, [nextFireDate timeIntervalSinceNow] * 1000);
     }
 
     // Run loop performers