colby/cappuccino
1
0
Fork 0
mirror of https://github.com/cappuccino/cappuccino.git synced 2026-09-29 21:57:41 +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:
Francisco Ryan Tolmasky I
2008-11-18 19:38:19 -08:00
parent bbeba1e735 3b65f460d6
commit 1be4ba0075
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Foundation/CPString.j
+1 -4
View File
@@ -90,10 +90,7 @@ var CPStringHashes = new objj_dictionary();
*/
+ (id)stringWithHash:(unsigned)aHash
{
var zeros = "000000",
digits = aHash.toString(16);
return zeros.substring(0, zeros.length - digits.length) + digits;
return sprintf("%06x", aHash);
}
/*!
Foundation/CPTimer.j
+1 -1
View File
@@ -249,7 +249,7 @@ var _CPTimerBridgeTimer = function(codeOrFunction, aDelay, shouldRepeat, functio
if (!functionArgs)
functionArgs = [];
theFunction = function() { codeOrFunction.apply(window, functionArgs); CPTimersForTimeoutIDs[timeoutID] = nil;}
theFunction = function() { codeOrFunction.apply(window, functionArgs); CPTimersForTimeoutIDs[timeoutID] = nil; }
}
CPTimersForTimeoutIDs[timeoutID] = [CPTimer scheduledTimerWithTimeInterval:aDelay / 1000 callback:theFunction repeats:shouldRepeat];
Tools/nib2cib/NSNibConnector.j
+3 -3
View File
@@ -49,7 +49,7 @@
- (id)initWithCoder:(CPCoder)aCoder
{
return [[_CPCibConnector alloc] NS_initWithCoder:aCoder];
return [self NS_initWithCoder:aCoder];
}
- (Class)classForKeyedArchiver
@@ -65,7 +65,7 @@
- (id)initWithCoder:(CPCoder)aCoder
{
return [[_CPCibControlConnector alloc] NS_initWithCoder:aCoder];
return [self NS_initWithCoder:aCoder];
}
- (Class)classForKeyedArchiver
@@ -81,7 +81,7 @@
- (id)initWithCoder:(CPCoder)aCoder
{
return [[_CPCibOutletConnector alloc] NS_initWithCoder:aCoder];
return [self NS_initWithCoder:aCoder];
}
- (Class)classForKeyedArchiver
Tools/nib2cib/NSView.j
+1 -1
View File
@@ -90,7 +90,7 @@
- (id)initWithCoder:(CPCoder)aCoder
{
return [[CPView alloc] NS_initWithCoder:aCoder];
return [self NS_initWithCoder:aCoder];
}
- (Class)classForKeyedArchiver