Skip to content
This repository was archived by the owner on Sep 5, 2024. It is now read-only.

fix(panel): Fix panel tests in Angular 1.3. #8418

Closed
wants to merge 1 commit into from
Closed

fix(panel): Fix panel tests in Angular 1.3. #8418

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/components/panel/panel.spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -592,7 +592,7 @@ describe('$mdPanel', function() {
var closeCalled = false;
panelRef.close = function() {
closeCalled = true;
return panelRef._$q.resolve(self);
return panelRef._$q.when(self);
};

clickPanelContainer();
Expand Down
44 changes: 26 additions & 18 deletions src/core/util/animation/animateCss.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,36 +140,44 @@ if (angular.version.minor >= 4) {
.factory('$$forceReflow', $$ForceReflowFactory)
.factory('$$AnimateRunner', $$AnimateRunnerFactory)
.factory('$$rAFMutex', $$rAFMutexFactory)
.factory('$animateCss', ['$window', '$$rAF', '$$AnimateRunner', '$$forceReflow', '$$jqLite', '$timeout',
function($window, $$rAF, $$AnimateRunner, $$forceReflow, $$jqLite, $timeout) {
.factory('$animateCss', ['$window', '$$rAF', '$$AnimateRunner', '$$forceReflow', '$$jqLite', '$timeout', '$animate',
function($window, $$rAF, $$AnimateRunner, $$forceReflow, $$jqLite, $timeout, $animate) {

function init(element, options) {

var temporaryStyles = [];
var node = getDomNode(element);
var areAnimationsAllowed = node && $animate.enabled();

if (options.transitionStyle) {
temporaryStyles.push([PREFIX + 'transition', options.transitionStyle]);
}
var hasCompleteStyles = false;
var hasCompleteClasses = false;

if (options.keyframeStyle) {
temporaryStyles.push([PREFIX + 'animation', options.keyframeStyle]);
}
if (areAnimationsAllowed) {
if (options.transitionStyle) {
temporaryStyles.push([PREFIX + 'transition', options.transitionStyle]);
}

if (options.delay) {
temporaryStyles.push([PREFIX + 'transition-delay', options.delay + 's']);
}
if (options.keyframeStyle) {
temporaryStyles.push([PREFIX + 'animation', options.keyframeStyle]);
}

if (options.delay) {
temporaryStyles.push([PREFIX + 'transition-delay', options.delay + 's']);
}

if (options.duration) {
temporaryStyles.push([PREFIX + 'transition-duration', options.duration + 's']);
}

hasCompleteStyles = options.keyframeStyle ||
(options.to && (options.duration > 0 || options.transitionStyle));
hasCompleteClasses = !!options.addClass || !!options.removeClass;

if (options.duration) {
temporaryStyles.push([PREFIX + 'transition-duration', options.duration + 's']);
blockTransition(element, true);
}

var hasCompleteStyles = options.keyframeStyle ||
(options.to && (options.duration > 0 || options.transitionStyle));
var hasCompleteClasses = !!options.addClass || !!options.removeClass;
var hasCompleteAnimation = hasCompleteStyles || hasCompleteClasses;
var hasCompleteAnimation = areAnimationsAllowed && (hasCompleteStyles || hasCompleteClasses);

blockTransition(element, true);
applyAnimationFromStyles(element, options);

var animationClosed = false;
Expand Down