mirror of
https://github.com/cappuccino/cappuccino.git
synced 2026-11-18 04:29:22 +00:00
Merge pull request #2166 from Dogild/PopoverAnimation
Fixed: CPPopover animation issue
This commit is contained in:
commit
215c1c53f5
1 file changed
+11
-1
@@ -513,6 +513,9 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4,
|
||||
{
|
||||
// We are watching opacity, so this triggers the next transition
|
||||
#if PLATFORM(DOM)
|
||||
// We force the style to recalculate the values, this is needed to avoid a transition issue
|
||||
// More information here : https://code.google.com/p/chromium/issues/detail?id=388082
|
||||
[self _currentTransformMatrix];
|
||||
_DOMElement.style.opacity = 1;
|
||||
_DOMElement.style.height = frame.size.height + @"px";
|
||||
_DOMElement.style.width = frame.size.width + @"px";
|
||||
@@ -608,7 +611,7 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4,
|
||||
_DOMElement.removeEventListener(CPBrowserStyleProperty('transitionend'), _orderFrontTransitionFunction, YES);
|
||||
_DOMElement.removeEventListener(CPBrowserStyleProperty('transitionend'), _transitionCompleteFunction, YES);
|
||||
|
||||
var matrix = window.getComputedStyle(_DOMElement, null)[CPBrowserStyleProperty(@"transform")],
|
||||
var matrix = [self _currentTransformMatrix],
|
||||
currentScale = (matrix.split('(')[1]).split(',')[0];
|
||||
|
||||
[self setCSS3Property:@"Transform" value:@"scale(" + currentScale + ")"];
|
||||
@@ -652,6 +655,13 @@ var _CPPopoverWindow_shouldClose_ = 1 << 4,
|
||||
#pragma mark -
|
||||
#pragma mark Private
|
||||
|
||||
- (CPString)_currentTransformMatrix
|
||||
{
|
||||
#if PLATFORM(DOM)
|
||||
return window.getComputedStyle(_DOMElement, null)[CPBrowserStyleProperty(@"transform")];
|
||||
#endif
|
||||
}
|
||||
|
||||
- (BOOL)_hasOnlyTransientChild:(_CPPopoverWindow)aWindow
|
||||
{
|
||||
var childWindows = [aWindow childWindows];
|
||||
|
||||
Reference in new issue
Block a user