Hopiu/angular.js
1
0
Fork 0
mirror of https://github.com/Hopiu/angular.js.git synced 2026-03-17 07:40:22 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix(ngShow/ngHide): revert to display:'' for show

Browse source 
Regression introduced by ngAnimation
SHA: 0b6f1ce5f8
This commit is contained in:
Misko Hevery 2013-04-03 14:55:03 -07:00
parent 820253f670
commit ecdf119a76
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/ng/animator.js
View file

@ -283,7 +283,7 @@ var $AnimatorProvider = function() {
}
function show(element) {
element.css('display', 'block');
element.css('display', '');
}
function hide(element) {

6
test/ng/animatorSpec.js
View file

@ -50,7 +50,7 @@ describe("$animator", function() {
element.css('display','none');
expect(element.css('display')).toBe('none');
animator.show(element);
expect(element.css('display')).toBe('block');
expect(element[0].style.display).toBe('');
}));
it("should animate the hide animation event", inject(function($animator, $compile, $rootScope) {
@ -125,9 +125,9 @@ describe("$animator", function() {
element.css('display','none');
expect(element.css('display')).toBe('none');
animator.show(element);
expect(element.css('display')).toBe('block');
expect(element[0].style.display).toBe('');
window.setTimeout.expect(1).process();
expect(element.css('display')).toBe('block');
expect(element[0].style.display).toBe('');
}));
it("should animate the hide animation event", inject(function($animator, $rootScope) {