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

fix($animate): accept unwrapped DOM elements as inputs for enter + move #11894

Closed
wants to merge 1 commit into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions src/ng/animate.js
Original file line number Diff line number Diff line change
Expand Up @@ -424,6 +424,8 @@ var $AnimateProvider = ['$provide', function($provide) {
*/
enter: function(element, parent, after, options) {
assertNoCallback(options);
parent = parent && jqLite(parent);
after = after && jqLite(after);
parent = parent || after.parent();
domInsert(element, parent, after);
return $$animateQueue.push(element, 'enter', options);
Expand All @@ -449,6 +451,8 @@ var $AnimateProvider = ['$provide', function($provide) {
*/
move: function(element, parent, after, options) {
assertNoCallback(options);
parent = parent && jqLite(parent);
after = after && jqLite(after);
parent = parent || after.parent();
domInsert(element, parent, after);
return $$animateQueue.push(element, 'move', options);
Expand Down
26 changes: 26 additions & 0 deletions test/ng/animateSpec.js
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,32 @@ describe("$animate", function() {

expect(element).toHaveClass('ng-hide');
}));

they("should accept an unwrapped \"parent\" element for the $prop event",
['enter', 'move'], function(method) {

inject(function($document, $animate, $rootElement) {
var element = jqLite('<div></div>');
var parent = $document[0].createElement('div');
$rootElement.append(parent);

$animate[method](element, parent);
expect(element[0].parentNode).toBe(parent);
});
});

they("should accept an unwrapped \"after\" element for the $prop event",
['enter', 'move'], function(method) {

inject(function($document, $animate, $rootElement) {
var element = jqLite('<div></div>');
var after = $document[0].createElement('div');
$rootElement.append(after);

$animate[method](element, null, after);
expect(element[0].previousSibling).toBe(after);
});
});
});

describe('CSS class DOM manipulation', function() {
Expand Down