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

Merge branch 'master' of github.com:cappuccino/cappuccino

Browse Source
This commit is contained in:
Alexander Ljungberg committed 2012-07-28 01:59:06 +01:00
2 parents df5a7104b1 2400b6aeab
commit a8150a84be
2 files changed
+5 -1
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

AppKit/CPWindow/_CPBorderlessBridgeWindowView.j
+1 -1
View File
@@ -38,7 +38,7 @@ var _CPToolbarViewBackgroundColor = nil;
_CPToolbarViewBackgroundColor = CPColorWithImages([
["_CPToolbarView/toolbar-background-top.png", 1, 1, bundle],
["_CPToolbarView/toolbar-background-center.png", 1, 57.0, bundle],
["_CPToolbarView/toolbar-background-bottom.png", 1, 1, bundle],
["_CPToolbarView/toolbar-background-bottom.png", 1, 1, bundle]
], CPColorPatternIsVertical);
}
AppKit/Cib/CPCib.j
+4
View File
@@ -61,6 +61,10 @@ var CPCibObjectDataKey = @"CPCibObjectDataKey";
if (self)
{
_data = [CPURLConnection sendSynchronousRequest:[CPURLRequest requestWithURL:aURL] returningResponse:nil];
if (!_data)
return nil;
_awakenCustomResources = YES;
}