diff options
| -rw-r--r-- | src/ng/animator.js | 2 | ||||
| -rw-r--r-- | src/ng/sniffer.js | 8 | ||||
| -rw-r--r-- | src/ngScenario/Application.js | 2 | ||||
| -rw-r--r-- | test/ng/animatorSpec.js | 4 | ||||
| -rwxr-xr-x | test/ng/directive/ngIfSpec.js | 10 | ||||
| -rw-r--r-- | test/ng/directive/ngIncludeSpec.js | 6 | ||||
| -rw-r--r-- | test/ng/directive/ngRepeatSpec.js | 8 | ||||
| -rw-r--r-- | test/ng/directive/ngShowHideSpec.js | 10 | ||||
| -rw-r--r-- | test/ng/directive/ngSwitchSpec.js | 12 | ||||
| -rw-r--r-- | test/ng/directive/ngViewSpec.js | 12 | ||||
| -rw-r--r-- | test/ng/snifferSpec.js | 67 |
11 files changed, 101 insertions, 40 deletions
diff --git a/src/ng/animator.js b/src/ng/animator.js index a69f0784..a8064f5e 100644 --- a/src/ng/animator.js +++ b/src/ng/animator.js @@ -241,7 +241,7 @@ var $AnimatorProvider = function() { if (!parent) { parent = after ? after.parent() : element.parent(); } - if ((!$sniffer.supportsTransitions && !polyfillSetup && !polyfillStart) || + if ((!$sniffer.transitions && !polyfillSetup && !polyfillStart) || (parent.inheritedData(NG_ANIMATE_CONTROLLER) || noop).running) { beforeFn(element, parent, after); afterFn(element, parent, after); diff --git a/src/ng/sniffer.js b/src/ng/sniffer.js index 8a2fd44f..86c8dd00 100644 --- a/src/ng/sniffer.js +++ b/src/ng/sniffer.js @@ -9,7 +9,8 @@ * * @property {boolean} history Does the browser support html5 history api ? * @property {boolean} hashchange Does the browser support hashchange event ? - * @property {boolean} supportsTransitions Does the browser support CSS transition events ? + * @property {boolean} transitions Does the browser support CSS transition events ? + * @property {boolean} animations Does the browser support CSS animation events ? * * @description * This is very simple implementation of testing browser's features. @@ -23,6 +24,7 @@ function $SnifferProvider() { vendorRegex = /^(Moz|webkit|O|ms)(?=[A-Z])/, bodyStyle = document.body && document.body.style, transitions = false, + animations = false, match; if (bodyStyle) { @@ -34,6 +36,7 @@ function $SnifferProvider() { } } transitions = !!(('transition' in bodyStyle) || (vendorPrefix + 'Transition' in bodyStyle)); + animations = !!(('animation' in bodyStyle) || (vendorPrefix + 'Animation' in bodyStyle)); } @@ -61,7 +64,8 @@ function $SnifferProvider() { }, csp: document.securityPolicy ? document.securityPolicy.isActive : false, vendorPrefix: vendorPrefix, - supportsTransitions : transitions + transitions : transitions, + animations : animations }; }]; } diff --git a/src/ngScenario/Application.js b/src/ngScenario/Application.js index 94192b8f..2f8208d2 100644 --- a/src/ngScenario/Application.js +++ b/src/ngScenario/Application.js @@ -75,7 +75,7 @@ angular.scenario.Application.prototype.navigateTo = function(url, loadFn, errorF // we don't need that for our tests, but it should be done $window.angular.resumeBootstrap([['$provide', function($provide) { $provide.decorator('$sniffer', function($delegate) { - $delegate.supportsTransitions = false; + $delegate.transitions = false; return $delegate; }); }]]); diff --git a/test/ng/animatorSpec.js b/test/ng/animatorSpec.js index daab9721..89677852 100644 --- a/test/ng/animatorSpec.js +++ b/test/ng/animatorSpec.js @@ -216,7 +216,7 @@ describe("$animator", function() { it("should assign the ngAnimate string to all events if a string is given", inject(function($animator, $sniffer, $rootScope) { $animator.enabled(true); - if (!$sniffer.supportsTransitions) return; + if (!$sniffer.transitions) return; animator = $animator($rootScope, { ngAnimate : '"custom"' }); @@ -328,7 +328,7 @@ describe("$animator", function() { expect(element.css('display')).toBe('none'); animator.show(element); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(1000).process(); } diff --git a/test/ng/directive/ngIfSpec.js b/test/ng/directive/ngIfSpec.js index 081ba5bf..3fa523a7 100755 --- a/test/ng/directive/ngIfSpec.js +++ b/test/ng/directive/ngIfSpec.js @@ -120,7 +120,7 @@ describe('ngIf ngAnimate', function () { expect(element.children().length).toBe(1); var first = element.children()[0]; - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(first.className).toContain('custom-enter-setup'); window.setTimeout.expect(1).process(); expect(first.className).toContain('custom-enter-start'); @@ -147,7 +147,7 @@ describe('ngIf ngAnimate', function () { expect(element.children().length).toBe(1); var first = element.children()[0]; - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(1000).process(); } else { @@ -155,9 +155,9 @@ describe('ngIf ngAnimate', function () { } $scope.$apply('value = false'); - expect(element.children().length).toBe($sniffer.supportsTransitions ? 1 : 0); + expect(element.children().length).toBe($sniffer.transitions ? 1 : 0); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(first.className).toContain('custom-leave-setup'); window.setTimeout.expect(1).process(); expect(first.className).toContain('custom-leave-start'); @@ -180,7 +180,7 @@ describe('ngIf ngAnimate', function () { ))($scope); $scope.$apply('value = true'); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(500).process(); } else { diff --git a/test/ng/directive/ngIncludeSpec.js b/test/ng/directive/ngIncludeSpec.js index 1ce55bb4..46507041 100644 --- a/test/ng/directive/ngIncludeSpec.js +++ b/test/ng/directive/ngIncludeSpec.js @@ -351,7 +351,7 @@ describe('ngInclude ngAnimate', function() { var child = jqLite(element.children()[0]); applyCSS(child, 'transition', '1s linear all'); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(child.attr('class')).toContain('custom-enter-setup'); window.setTimeout.expect(1).process(); @@ -384,7 +384,7 @@ describe('ngInclude ngAnimate', function() { $rootScope.tpl = ''; $rootScope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(child.attr('class')).toContain('custom-leave-setup'); window.setTimeout.expect(1).process(); @@ -417,7 +417,7 @@ describe('ngInclude ngAnimate', function() { $rootScope.tpl = 'enter'; $rootScope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(500).process(); } else { diff --git a/test/ng/directive/ngRepeatSpec.js b/test/ng/directive/ngRepeatSpec.js index ac1ce7e7..91dcd27f 100644 --- a/test/ng/directive/ngRepeatSpec.js +++ b/test/ng/directive/ngRepeatSpec.js @@ -608,7 +608,7 @@ describe('ngRepeat ngAnimate', function() { applyCSS(kids[i], 'transition', '1s linear all'); } - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { angular.forEach(kids, function(kid) { expect(kid.attr('class')).toContain('custom-enter-setup'); window.setTimeout.expect(1).process(); @@ -654,7 +654,7 @@ describe('ngRepeat ngAnimate', function() { //the last element gets pushed down when it animates var kid = jqLite(element.children()[1]); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(kid.attr('class')).toContain('custom-leave-setup'); window.setTimeout.expect(1).process(); expect(kid.attr('class')).toContain('custom-leave-start'); @@ -696,7 +696,7 @@ describe('ngRepeat ngAnimate', function() { var left = jqLite(kids[1]); var right = jqLite(kids[2]); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(first.attr('class')).toContain('custom-move-setup'); window.setTimeout.expect(1).process(); expect(left.attr('class')).toContain('custom-move-setup'); @@ -743,7 +743,7 @@ describe('ngRepeat ngAnimate', function() { applyCSS(first, cssProp, cssValue); applyCSS(second, cssProp, cssValue); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(1).process(); window.setTimeout.expect(500).process(); diff --git a/test/ng/directive/ngShowHideSpec.js b/test/ng/directive/ngShowHideSpec.js index ecc5b2dc..46bef95d 100644 --- a/test/ng/directive/ngShowHideSpec.js +++ b/test/ng/directive/ngShowHideSpec.js @@ -87,7 +87,7 @@ describe('ngShow / ngHide - ngAnimate', function() { ))($scope); $scope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(element.attr('class')).toContain('custom-show-setup'); window.setTimeout.expect(1).process(); @@ -102,7 +102,7 @@ describe('ngShow / ngHide - ngAnimate', function() { $scope.on = false; $scope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(element.attr('class')).toContain('custom-hide-setup'); window.setTimeout.expect(1).process(); expect(element.attr('class')).toContain('custom-hide-start'); @@ -133,7 +133,7 @@ describe('ngShow / ngHide - ngAnimate', function() { $rootElement.controller('ngAnimate').running = false; $rootScope.val = false; $rootScope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(0).process(); } else { @@ -157,7 +157,7 @@ describe('ngShow / ngHide - ngAnimate', function() { ))($scope); $scope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(element.attr('class')).toContain('custom-hide-setup'); window.setTimeout.expect(1).process(); @@ -173,7 +173,7 @@ describe('ngShow / ngHide - ngAnimate', function() { $scope.off = false; $scope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(element.attr('class')).toContain('custom-show-setup'); window.setTimeout.expect(1).process(); expect(element.attr('class')).toContain('custom-show-start'); diff --git a/test/ng/directive/ngSwitchSpec.js b/test/ng/directive/ngSwitchSpec.js index ee51e194..373ce4e1 100644 --- a/test/ng/directive/ngSwitchSpec.js +++ b/test/ng/directive/ngSwitchSpec.js @@ -261,7 +261,7 @@ describe('ngSwitch ngAnimate', function() { expect(element.children().length).toBe(1); var first = element.children()[0]; - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(first.className).toContain('cool-enter-setup'); window.setTimeout.expect(1).process(); @@ -292,7 +292,7 @@ describe('ngSwitch ngAnimate', function() { $scope.val = 'two'; $scope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(1000).process(); } else { @@ -302,11 +302,11 @@ describe('ngSwitch ngAnimate', function() { $scope.val = 'three'; $scope.$digest(); - expect(element.children().length).toBe($sniffer.supportsTransitions ? 2 : 1); + expect(element.children().length).toBe($sniffer.transitions ? 2 : 1); var first = element.children()[0]; - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(first.className).toContain('cool-leave-setup'); window.setTimeout.expect(1).process(); window.setTimeout.expect(1).process(); @@ -315,7 +315,7 @@ describe('ngSwitch ngAnimate', function() { } - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(first.className).toContain('cool-leave-start'); window.setTimeout.expect(1000).process(); window.setTimeout.expect(1000).process(); @@ -339,7 +339,7 @@ describe('ngSwitch ngAnimate', function() { $rootScope.val = 'one'; $rootScope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { window.setTimeout.expect(1).process(); window.setTimeout.expect(500).process(); } else { diff --git a/test/ng/directive/ngViewSpec.js b/test/ng/directive/ngViewSpec.js index c31c2449..908408b3 100644 --- a/test/ng/directive/ngViewSpec.js +++ b/test/ng/directive/ngViewSpec.js @@ -554,7 +554,7 @@ describe('ngView', function() { var child = jqLite(element.children()[0]); applyCSS(child, 'transition', '1s linear all'); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(child.attr('class')).toContain('custom-enter-setup'); window.setTimeout.expect(1).process(); @@ -583,7 +583,7 @@ describe('ngView', function() { $location.path('/'); $rootScope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { expect(child.attr('class')).toContain('custom-leave-setup'); window.setTimeout.expect(1).process(); @@ -614,9 +614,9 @@ describe('ngView', function() { var child = jqLite(element.children()[0]); applyCSS(child, 'transition', '0.5s linear all'); - if($sniffer.supportsTransitions) { + if($sniffer.transitions) { window.setTimeout.expect(1).process(); - window.setTimeout.expect($sniffer.supportsTransitions ? 500 : 0).process(); + window.setTimeout.expect($sniffer.transitions ? 500 : 0).process(); } else { expect(window.setTimeout.queue).toEqual([]); } @@ -641,7 +641,7 @@ describe('ngView', function() { $location.path('/foo'); $rootScope.$digest(); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { $window.setTimeout.expect(1).process(); $window.setTimeout.expect(0).process(); } @@ -650,7 +650,7 @@ describe('ngView', function() { $location.path('/bar'); $rootScope.$digest(); expect(n(element.text())).toEqual('1234'); - if ($sniffer.supportsTransitions) { + if ($sniffer.transitions) { $window.setTimeout.expect(1).process(); $window.setTimeout.expect(1).process(); } else { diff --git a/test/ng/snifferSpec.js b/test/ng/snifferSpec.js index 3a450e24..5cdc8fd9 100644 --- a/test/ng/snifferSpec.js +++ b/test/ng/snifferSpec.js @@ -124,11 +124,68 @@ describe('$sniffer', function() { }); - describe('supportsTransitions', function() { + describe('animations', function() { + it('should be either true or false', function() { + inject(function($sniffer) { + expect($sniffer.animations).not.toBe(undefined); + }); + }); + + it('should be false when there is no animation style', function() { + module(function($provide) { + var doc = { + body : { + style : {} + } + }; + $provide.value('$document', jqLite(doc)); + }); + inject(function($sniffer) { + expect($sniffer.animations).toBe(false); + }); + }); + + it('should be true with vendor-specific animations', function() { + module(function($provide) { + var animationStyle = 'some_animation 2s linear'; + var doc = { + body : { + style : { + WebkitAnimation : animationStyle, + MozAnimation : animationStyle, + OAnimation : animationStyle + } + } + }; + $provide.value('$document', jqLite(doc)); + }); + inject(function($sniffer) { + expect($sniffer.animations).toBe(true); + }); + }); + + it('should be true with w3c-style animations', function() { + module(function($provide) { + var doc = { + body : { + style : { + animation : 'some_animation 2s linear' + } + } + }; + $provide.value('$document', jqLite(doc)); + }); + inject(function($sniffer) { + expect($sniffer.animations).toBe(true); + }); + }); + }); + + describe('transitions', function() { it('should be either true or false', function() { inject(function($sniffer) { - expect($sniffer.supportsTransitions).not.toBe(undefined); + expect($sniffer.transitions).not.toBe(undefined); }); }); @@ -142,7 +199,7 @@ describe('$sniffer', function() { $provide.value('$document', jqLite(doc)); }); inject(function($sniffer) { - expect($sniffer.supportsTransitions).toBe(false); + expect($sniffer.transitions).toBe(false); }); }); @@ -161,7 +218,7 @@ describe('$sniffer', function() { $provide.value('$document', jqLite(doc)); }); inject(function($sniffer) { - expect($sniffer.supportsTransitions).toBe(true); + expect($sniffer.transitions).toBe(true); }); }); @@ -177,7 +234,7 @@ describe('$sniffer', function() { $provide.value('$document', jqLite(doc)); }); inject(function($sniffer) { - expect($sniffer.supportsTransitions).toBe(true); + expect($sniffer.transitions).toBe(true); }); }); |