colby/cappuccino
1
0 Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-10-28 19:08:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Tom Robinson committed 2008-11-18 20:19:56 -08:00
2 parents db542fa905 30f905a253
commit b4b28cda92
2 files changed
+18 -14
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPAlert.j
+11 -11
View File
@@ -23,17 +23,17 @@
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
*/
import <Foundation/CPObject.j>
import <Foundation/CPString.j>
@import <Foundation/CPObject.j>
@import <Foundation/CPString.j>
import <AppKit/CPApplication.j>
import <AppKit/CPButton.j>
import <AppKit/CPColor.j>
import <AppKit/CPFont.j>
import <AppKit/CPImage.j>
import <AppKit/CPImageView.j>
import <AppKit/CPPanel.j>
import <AppKit/CPTextField.j>
@import <AppKit/CPApplication.j>
@import <AppKit/CPButton.j>
@import <AppKit/CPColor.j>
@import <AppKit/CPFont.j>
@import <AppKit/CPImage.j>
@import <AppKit/CPImageView.j>
@import <AppKit/CPPanel.j>
@import <AppKit/CPTextField.j>
/*
@global
@@ -240,4 +240,4 @@ var CPAlertWarningImage,
[_alertPanel close];
}
@end
@end
Tools/Utilities/bridge.js
+7 -3
View File
@@ -54,16 +54,20 @@ window.prompt = function(obj)
// This implementation is single-threaded (like browsers) but requires a call to serviceTimeouts()
// Also includes beginning of a multithreaded implementation (commented out)
window.setTimeout = function(callback, delay)
window.setNativeTimeout = function(callback, delay)
{
return _scheduleTimeout(callback, delay, false);
}
window.setInterval = function(callback, delay)
window.setTimeout = window.setNativeTimeout;
window.setNativeInterval = function(callback, delay)
{
return _scheduleTimeout(callback, delay, true);
}
window.setInterval = window.setInterval;
window.clearTimeout = function(id)
{
if (_timeouts[id])
@@ -548,7 +552,7 @@ XMLHttpRequest.prototype.send = function(body)
if (this.onreadystatechange)
{
if (this.async)
setTimeout(this.onreadystatechange, 0);
setNativeTimeout(this.onreadystatechange, 0);
else
this.onreadystatechange();
}