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

Commit fab2d3c

Browse files
committed
style(animate): remove ws
1 parent 4f84f6b commit fab2d3c

File tree

2 files changed

+22
-22
lines changed

2 files changed

+22
-22
lines changed

src/ngAnimate/animate.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1375,7 +1375,7 @@ angular.module('ngAnimate', ['ng'])
13751375
event.stopPropagation();
13761376
var ev = event.originalEvent || event;
13771377
var timeStamp = ev.$manualTimeStamp || ev.timeStamp || Date.now();
1378-
1378+
13791379
/* Firefox (or possibly just Gecko) likes to not round values up
13801380
* when a ms measurement is used for the animation */
13811381
var elapsedTime = parseFloat(ev.elapsedTime.toFixed(ELAPSED_TIME_MAX_DECIMAL_PLACES));

test/ngAnimate/animateSpec.js

+21-21
Original file line numberDiff line numberDiff line change
@@ -482,19 +482,19 @@ describe("ngAnimate", function() {
482482

483483
element.append(child);
484484
child.attr('style', 'width: 20px');
485-
485+
486486
$animate.addClass(child, 'ng-hide');
487487
$animate.leave(child);
488488
$rootScope.$digest();
489489

490490
if($sniffer.transitions) {
491491
$animate.triggerReflow();
492492

493-
//this is to verify that the existing style is appended with a semicolon automatically
493+
//this is to verify that the existing style is appended with a semicolon automatically
494494
expect(child.attr('style')).toMatch(/width: 20px;.*?/i);
495495
browserTrigger(child,'transitionend', { timeStamp: Date.now() + 1000, elapsedTime: 1 });
496496
}
497-
497+
498498
expect(child.attr('style')).toMatch(/width: 20px/i);
499499
}));
500500

@@ -523,7 +523,7 @@ describe("ngAnimate", function() {
523523

524524
var completed = false;
525525
$animate.enter(child, element, null, function() {
526-
completed = true;
526+
completed = true;
527527
});
528528
$rootScope.$digest();
529529

@@ -783,19 +783,19 @@ describe("ngAnimate", function() {
783783
$animate.enabled(true);
784784

785785
ss.addRule('.real-animation.ng-enter, .real-animation.ng-leave, .real-animation-fake.ng-enter, .real-animation-fake.ng-leave',
786-
'-webkit-animation:1s my_animation;' +
786+
'-webkit-animation:1s my_animation;' +
787787
'animation:1s my_animation;');
788788

789789
ss.addRule('.real-animation.ng-enter-stagger, .real-animation.ng-leave-stagger',
790790
'-webkit-animation-delay:0.1s;' +
791791
'-webkit-animation-duration:0s;' +
792-
'animation-delay:0.1s;' +
792+
'animation-delay:0.1s;' +
793793
'animation-duration:0s;');
794794

795795
ss.addRule('.fake-animation.ng-enter-stagger, .fake-animation.ng-leave-stagger',
796796
'-webkit-animation-delay:0.1s;' +
797797
'-webkit-animation-duration:1s;' +
798-
'animation-delay:0.1s;' +
798+
'animation-delay:0.1s;' +
799799
'animation-duration:1s;');
800800

801801
var container = $compile(html('<div></div>'))($rootScope);
@@ -850,7 +850,7 @@ describe("ngAnimate", function() {
850850
$animate.enabled(true);
851851

852852
ss.addRule('.stagger-animation.ng-enter, .stagger-animation.ng-leave',
853-
'-webkit-animation:my_animation 1s 1s, your_animation 1s 2s;' +
853+
'-webkit-animation:my_animation 1s 1s, your_animation 1s 2s;' +
854854
'animation:my_animation 1s 1s, your_animation 1s 2s;');
855855

856856
ss.addRule('.stagger-animation.ng-enter-stagger, .stagger-animation.ng-leave-stagger',
@@ -1074,19 +1074,19 @@ describe("ngAnimate", function() {
10741074
$animate.enabled(true);
10751075

10761076
ss.addRule('.real-animation.ng-enter, .real-animation.ng-leave, .real-animation-fake.ng-enter, .real-animation-fake.ng-leave',
1077-
'-webkit-transition:1s linear all;' +
1077+
'-webkit-transition:1s linear all;' +
10781078
'transition:1s linear all;');
10791079

10801080
ss.addRule('.real-animation.ng-enter-stagger, .real-animation.ng-leave-stagger',
10811081
'-webkit-transition-delay:0.1s;' +
10821082
'-webkit-transition-duration:0s;' +
1083-
'transition-delay:0.1s;' +
1083+
'transition-delay:0.1s;' +
10841084
'transition-duration:0s;');
10851085

10861086
ss.addRule('.fake-animation.ng-enter-stagger, .fake-animation.ng-leave-stagger',
10871087
'-webkit-transition-delay:0.1s;' +
10881088
'-webkit-transition-duration:1s;' +
1089-
'transition-delay:0.1s;' +
1089+
'transition-delay:0.1s;' +
10901090
'transition-duration:1s;');
10911091

10921092
var container = $compile(html('<div></div>'))($rootScope);
@@ -1142,7 +1142,7 @@ describe("ngAnimate", function() {
11421142
$animate.enabled(true);
11431143

11441144
ss.addRule('.stagger-animation.ng-enter, .ani.ng-leave',
1145-
'-webkit-transition:1s linear color 2s, 3s linear font-size 4s;' +
1145+
'-webkit-transition:1s linear color 2s, 3s linear font-size 4s;' +
11461146
'transition:1s linear color 2s, 3s linear font-size 4s;');
11471147

11481148
ss.addRule('.stagger-animation.ng-enter-stagger, .ani.ng-leave-stagger',
@@ -1234,7 +1234,7 @@ describe("ngAnimate", function() {
12341234

12351235
it("should not allow the closing animation to close off a successive animation midway",
12361236
inject(function($animate, $rootScope, $compile, $sniffer, $timeout) {
1237-
1237+
12381238
if (!$sniffer.transitions) return;
12391239

12401240
ss.addRule('.some-class-add', '-webkit-transition:5s linear all;' +
@@ -1272,9 +1272,9 @@ describe("ngAnimate", function() {
12721272
$animate.enabled(true);
12731273

12741274
ss.addRule('.stagger-animation.ng-enter, .stagger-animation.ng-leave',
1275-
'-webkit-animation:my_animation 1s 1s, your_animation 1s 2s;' +
1275+
'-webkit-animation:my_animation 1s 1s, your_animation 1s 2s;' +
12761276
'animation:my_animation 1s 1s, your_animation 1s 2s;' +
1277-
'-webkit-transition:1s linear all 1s;' +
1277+
'-webkit-transition:1s linear all 1s;' +
12781278
'transition:1s linear all 1s;');
12791279

12801280
ss.addRule('.stagger-animation.ng-enter-stagger, .stagger-animation.ng-leave-stagger',
@@ -1544,7 +1544,7 @@ describe("ngAnimate", function() {
15441544
expect(steps.shift()).toEqual(['close', 'klass', 'addClass']);
15451545

15461546
expect(steps.shift()).toEqual(['done', 'klass', 'addClass']);
1547-
}));
1547+
}));
15481548

15491549
it('should fire the DOM callbacks even if no animation is rendered',
15501550
inject(function($animate, $rootScope, $compile, $sniffer, $rootElement, $timeout) {
@@ -1572,7 +1572,7 @@ describe("ngAnimate", function() {
15721572

15731573
expect(steps.shift()).toEqual(['before', 'ng-enter', 'enter']);
15741574
expect(steps.shift()).toEqual(['after', 'ng-enter', 'enter']);
1575-
}));
1575+
}));
15761576

15771577
it('should not fire DOM callbacks on the element being animated unless registered',
15781578
inject(function($animate, $rootScope, $compile, $sniffer, $rootElement, $timeout) {
@@ -2551,7 +2551,7 @@ describe("ngAnimate", function() {
25512551
}
25522552
});
25532553
});
2554-
2554+
25552555
inject(function($compile, $rootScope, $animate, $timeout, $rootElement) {
25562556
$animate.enabled(true);
25572557

@@ -2832,7 +2832,7 @@ describe("ngAnimate", function() {
28322832

28332833

28342834
it('should perform pre and post animations', function() {
2835-
var steps = [];
2835+
var steps = [];
28362836
module(function($animateProvider) {
28372837
$animateProvider.register('.class-animate', function() {
28382838
return {
@@ -2861,7 +2861,7 @@ describe("ngAnimate", function() {
28612861

28622862

28632863
it('should treat the leave event always as a before event and discard the beforeLeave function', function() {
2864-
var parentID, steps = [];
2864+
var parentID, steps = [];
28652865
module(function($animateProvider) {
28662866
$animateProvider.register('.animate', function() {
28672867
return {
@@ -3080,7 +3080,7 @@ describe("ngAnimate", function() {
30803080
var element = $compile('<div>' +
30813081
' <div ng-repeat="item in items"' +
30823082
' ng-include="tpl"' +
3083-
' class="special"></div>' +
3083+
' class="special"></div>' +
30843084
'</div>')($rootScope);
30853085

30863086
ss.addRule('.special', '-webkit-transition:1s linear all;' +

0 commit comments

Comments
 (0)