aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--src/ng/animator.js2
-rw-r--r--test/ng/animatorSpec.js6
2 files changed, 4 insertions, 4 deletions
diff --git a/src/ng/animator.js b/src/ng/animator.js
index 059e7684..f3714db8 100644
--- a/src/ng/animator.js
+++ b/src/ng/animator.js
@@ -283,7 +283,7 @@ var $AnimatorProvider = function() {
}
function show(element) {
- element.css('display', 'block');
+ element.css('display', '');
}
function hide(element) {
diff --git a/test/ng/animatorSpec.js b/test/ng/animatorSpec.js
index d8ceffab..07bcb36c 100644
--- a/test/ng/animatorSpec.js
+++ b/test/ng/animatorSpec.js
@@ -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) {