Merge branch 'master' of git@github.com:tolmasky/cappuccino into tolmasky
No files matched your search
@@ -396,10 +396,13 @@ CPTableColumnUserResizingMask;
|
||||
for (var viewHash in _purgableInfosForDataView)
|
||||
{
|
||||
var purgableInfos = _purgableInfosForDataView[viewHash];
|
||||
|
||||
for (var key in purgableInfos)
|
||||
{
|
||||
var view = PurgableInfoView(purgableInfos[key]);
|
||||
|
||||
//CPLog.error("PURGING: " + view);
|
||||
|
||||
[view removeFromSuperview];
|
||||
delete purgableInfos[key];
|
||||
}
|
||||
|
||||
@@ -536,7 +536,7 @@ CPWebViewScrollNative = 2;
|
||||
{
|
||||
if (self = [super init])
|
||||
{
|
||||
_window = aWindow
|
||||
_window = aWindow;
|
||||
}
|
||||
return self;
|
||||
}
|
||||
@@ -593,6 +593,8 @@ CPWebViewScrollNative = 2;
|
||||
#if PLATFORM(DOM)
|
||||
[self _initDOMWithFrame:[self frame]];
|
||||
#endif
|
||||
|
||||
[self setBackgroundColor:[CPColor whiteColor]];
|
||||
}
|
||||
|
||||
return self;
|
||||
|
||||
|
Before Width: | Height: | Size: 120 B After Width: | Height: | Size: 121 B |
|
Before Width: | Height: | Size: 115 B After Width: | Height: | Size: 111 B |
|
Before Width: | Height: | Size: 110 B After Width: | Height: | Size: 109 B |
|
Before Width: | Height: | Size: 116 B After Width: | Height: | Size: 114 B |
|
Before Width: | Height: | Size: 120 B After Width: | Height: | Size: 118 B |
|
Before Width: | Height: | Size: 160 B After Width: | Height: | Size: 164 B |
|
Before Width: | Height: | Size: 165 B After Width: | Height: | Size: 161 B |
|
Before Width: | Height: | Size: 164 B After Width: | Height: | Size: 154 B |
|
Before Width: | Height: | Size: 162 B After Width: | Height: | Size: 154 B |