colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-01 22:56:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix for textfields no longer working with new timers -- timers firing before one native run loop has occured.

Browse Source 
[#154 state:resolved]

Reviewed by me.
This commit is contained in:
Francisco Tolmasky
2008-12-05 20:42:12 -08:00
parent 462bed7d67
commit cf5fa034b9
1 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPRunLoop.j
+19 -3
View File
@@ -135,6 +135,8 @@ var _CPRunLoopPerformPool = [],
@end
var CPRunLoopLastNativeRunLoop = 0;
/*! @class CPRunLoop
CPRunLoop instances handle various utility tasks that must be performed repetitively in an application, such as processing input events.
@@ -249,12 +251,18 @@ var _CPRunLoopPerformPool = [],
*/
- (void)addTimer:(CPTimer)aTimer forMode:(CPString)aMode
{
// FIXME: Timer already added...
if (_timersForModes[aMode])
_timersForModes[aMode].push(aTimer);
else
_timersForModes[aMode] = [aTimer];
_didAddTimer = YES;
if (!aTimer._lastNativeRunLoopsForModes)
aTimer._lastNativeRunLoopsForModes = {};
aTimer._lastNativeRunLoopsForModes[aMode] = CPRunLoopLastNativeRunLoop;
}
/*!
@@ -296,17 +304,25 @@ var _CPRunLoopPerformPool = [],
{
var timer = timers[index];
if (timer._isValid && timer._fireDate <= now)
if (timer._lastNativeRunLoopsForModes[aMode] < CPRunLoopLastNativeRunLoop && timer._isValid && timer._fireDate <= now)
[timer fire];
// Timer may or may not still be valid
if (timer._isValid)
nextFireDate = (nextFireDate === nil) ? timer._fireDate : [nextFireDate earlierDate:timer._fireDate];
else
{
// FIXME: Is there an issue with reseting the fire date in -fire? or adding it back to the run loop?...
timer._lastNativeRunLoopsForModes[aMode] = 0;
timers.splice(index, 1);
}
}
// Timers may have been added during the firing of timers
// They do NOT get a shot at firing, because they certainly
// haven't gone through one native timer.
var newTimers = _timersForModes[aMode];
if (newTimers && newTimers.length)
@@ -332,7 +348,7 @@ var _CPRunLoopPerformPool = [],
//initiate a new window.setTimeout if there are any timers
if (_nextTimerFireDatesForModes[aMode] !== nil)
_nativeTimersForModes[aMode] = window.setNativeTimeout(function() { _nativeTimersForModes[aMode] = nil; [self limitDateForMode:aMode]; }, MAX(0, [nextFireDate timeIntervalSinceNow] * 1000));
_nativeTimersForModes[aMode] = window.setNativeTimeout(function() { _nativeTimersForModes[aMode] = nil; ++CPRunLoopLastNativeRunLoop; [self limitDateForMode:aMode]; _isNativeTimerRun = NO; }, MAX(0, [nextFireDate timeIntervalSinceNow] * 1000));
}
// Run loop performers