Fixed: type with the method _windowWillBeAddedToTheDOM in CPWindow

This commit is contained in:
Alexandre Wilhelm committed 2014-12-02 10:03:13 -08:00
1 parent f5d847f320
commit c3ce0a61b6
2 files changed
+5 -5

No files matched your search

+3 -3
View File
@@ -914,13 +914,13 @@ CPTexturedBackgroundWindowMask
[_parentView orderFront:self];
// Save the boolean since it will be updated in the method order:window:relativeTo:
var isVisible = _isVisible;
var wasVisible = _isVisible;
[_platformWindow orderFront:self];
[_platformWindow order:CPWindowAbove window:self relativeTo:nil];
// setFrame is set after ordering the window as this method can send some notifications
if (isVisible)
if (wasVisible)
[self _setFrame:_frame display:YES animate:NO constrainWidth:YES constrainHeight:YES];
#endif
@@ -945,7 +945,7 @@ CPTexturedBackgroundWindowMask
/*
Called when the window is displayed in the DOM
*/
- (void)_windowWillBeAddedInTheDOM
- (void)_windowWillBeAddedToTheDOM
{
[[self contentView] _addObservers];
}
+2 -2
View File
@@ -1348,7 +1348,7 @@ var PreventScroll = true;
if (otherWindow)
insertionIndex = orderingMode === CPWindowAbove ? otherWindow._index + 1 : otherWindow._index;
[aWindow _windowWillBeAddedInTheDOM];
[aWindow _windowWillBeAddedToTheDOM];
// Place the window at the appropriate index.
[layer insertWindow:aWindow atIndex:insertionIndex];
@@ -1401,7 +1401,7 @@ var PreventScroll = true;
var index = ordering === CPWindowAbove ? parent._index + 1 : parent._index;
if (!childWasVisible)
[child _windowWillBeAddInTheDOM];
[child _windowWillBeAddedToTheDOM];
[aLayer insertWindow:child atIndex:index];