@@ -1452,105 +1452,105 @@ describe("ngAnimate", function() {
1452
1452
} ) ;
1453
1453
} ) ;
1454
1454
1455
- it ( "should add and remove CSS classes and perform CSS animations during the process" ,
1456
- inject ( function ( $compile , $rootScope , $animate , $sniffer , $timeout ) {
1457
-
1458
- ss . addRule ( '.on-add' , 'transition: 10s linear all; ' +
1459
- vendorPrefix + 'transition: 10s linear all' ) ;
1460
- ss . addRule ( '.on-remove' , 'transition: 10s linear all; ' +
1461
- vendorPrefix + 'transition: 10s linear all' ) ;
1462
-
1463
- var element = html ( $compile ( '<div></div>' ) ( $rootScope ) ) ;
1464
-
1465
- expect ( element . hasClass ( 'on' ) ) . toBe ( false ) ;
1466
-
1467
- $animate . addClass ( element , 'on' ) ;
1468
-
1469
- if ( $sniffer . transitions ) {
1470
- expect ( element . hasClass ( 'on' ) ) . toBe ( false ) ;
1471
- expect ( element . hasClass ( 'on-add' ) ) . toBe ( true ) ;
1472
- $timeout . flush ( ) ;
1473
- }
1474
-
1475
- $timeout . flush ( ) ;
1476
-
1477
- expect ( element . hasClass ( 'on' ) ) . toBe ( true ) ;
1478
- expect ( element . hasClass ( 'on-add' ) ) . toBe ( false ) ;
1479
- expect ( element . hasClass ( 'on-add-active' ) ) . toBe ( false ) ;
1480
-
1481
- $animate . removeClass ( element , 'on' ) ;
1482
- if ( $sniffer . transitions ) {
1483
- expect ( element . hasClass ( 'on' ) ) . toBe ( true ) ;
1484
- expect ( element . hasClass ( 'on-remove' ) ) . toBe ( true ) ;
1485
- $timeout . flush ( 10000 ) ;
1486
- }
1487
-
1488
- $timeout . flush ( ) ;
1489
- expect ( element . hasClass ( 'on' ) ) . toBe ( false ) ;
1490
- expect ( element . hasClass ( 'on-remove' ) ) . toBe ( false ) ;
1491
- expect ( element . hasClass ( 'on-remove-active' ) ) . toBe ( false ) ;
1492
- } ) ) ;
1493
-
1494
- it ( "should show and hide elements with CSS & JS animations being performed in the process" , function ( ) {
1495
- module ( function ( $animateProvider ) {
1496
- $animateProvider . register ( '.displayer' , function ( $timeout ) {
1497
- return {
1498
- removeClass : function ( element , className , done ) {
1499
- element . removeClass ( 'hiding' ) ;
1500
- element . addClass ( 'showing' ) ;
1501
- $timeout ( done , 25 , false ) ;
1502
- } ,
1503
- addClass : function ( element , className , done ) {
1504
- element . removeClass ( 'showing' ) ;
1505
- element . addClass ( 'hiding' ) ;
1506
- $timeout ( done , 555 , false ) ;
1507
- }
1508
- }
1509
- } ) ;
1510
- } )
1511
- inject ( function ( $compile , $rootScope , $animate , $sniffer , $timeout ) {
1512
-
1513
- ss . addRule ( '.ng-hide-add' , 'transition: 5s linear all;' +
1514
- vendorPrefix + 'transition: 5s linear all' ) ;
1515
- ss . addRule ( '.ng-hide-remove' , 'transition: 5s linear all;' +
1516
- vendorPrefix + 'transition: 5s linear all' ) ;
1517
-
1518
- var element = html ( $compile ( '<div></div>' ) ( $rootScope ) ) ;
1519
-
1520
- element . addClass ( 'displayer' ) ;
1521
-
1522
- expect ( element ) . toBeShown ( ) ;
1523
- expect ( element . hasClass ( 'showing' ) ) . toBe ( false ) ;
1524
- expect ( element . hasClass ( 'hiding' ) ) . toBe ( false ) ;
1525
-
1526
- $animate . addClass ( element , 'ng-hide' ) ;
1527
-
1528
- if ( $sniffer . transitions ) {
1529
- expect ( element ) . toBeShown ( ) ; //still showing
1530
- $timeout . flush ( ) ;
1531
- expect ( element ) . toBeShown ( ) ;
1532
- $timeout . flushNext ( 5555 ) ;
1533
- }
1534
- $timeout . flush ( ) ;
1535
- expect ( element ) . toBeHidden ( ) ;
1536
-
1537
- expect ( element . hasClass ( 'showing' ) ) . toBe ( false ) ;
1538
- expect ( element . hasClass ( 'hiding' ) ) . toBe ( true ) ;
1539
- $animate . removeClass ( element , 'ng-hide' ) ;
1540
-
1541
- if ( $sniffer . transitions ) {
1542
- expect ( element ) . toBeHidden ( ) ;
1543
- $timeout . flush ( ) ;
1544
- expect ( element ) . toBeHidden ( ) ;
1545
- $timeout . flushNext ( 5580 ) ;
1546
- }
1547
- $timeout . flush ( ) ;
1548
- expect ( element ) . toBeShown ( ) ;
1549
-
1550
- expect ( element . hasClass ( 'showing' ) ) . toBe ( true ) ;
1551
- expect ( element . hasClass ( 'hiding' ) ) . toBe ( false ) ;
1552
- } ) ;
1553
- } ) ;
1455
+ // it("should add and remove CSS classes and perform CSS animations during the process",
1456
+ // inject(function($compile, $rootScope, $animate, $sniffer, $timeout) {
1457
+ //
1458
+ // ss.addRule('.on-add', 'transition: 10s linear all; ' +
1459
+ // vendorPrefix + 'transition: 10s linear all');
1460
+ // ss.addRule('.on-remove', 'transition: 10s linear all; ' +
1461
+ // vendorPrefix + 'transition: 10s linear all');
1462
+ //
1463
+ // var element = html($compile('<div></div>')($rootScope));
1464
+ //
1465
+ // expect(element.hasClass('on')).toBe(false);
1466
+ //
1467
+ // $animate.addClass(element, 'on');
1468
+ //
1469
+ // if($sniffer.transitions) {
1470
+ // expect(element.hasClass('on')).toBe(false);
1471
+ // expect(element.hasClass('on-add')).toBe(true);
1472
+ // $timeout.flush();
1473
+ // }
1474
+ //
1475
+ // $timeout.flush();
1476
+ //
1477
+ // expect(element.hasClass('on')).toBe(true);
1478
+ // expect(element.hasClass('on-add')).toBe(false);
1479
+ // expect(element.hasClass('on-add-active')).toBe(false);
1480
+ //
1481
+ // $animate.removeClass(element, 'on');
1482
+ // if($sniffer.transitions) {
1483
+ // expect(element.hasClass('on')).toBe(true);
1484
+ // expect(element.hasClass('on-remove')).toBe(true);
1485
+ // $timeout.flush(10000);
1486
+ // }
1487
+ //
1488
+ // $timeout.flush();
1489
+ // expect(element.hasClass('on')).toBe(false);
1490
+ // expect(element.hasClass('on-remove')).toBe(false);
1491
+ // expect(element.hasClass('on-remove-active')).toBe(false);
1492
+ // }));
1493
+ //
1494
+ // it("should show and hide elements with CSS & JS animations being performed in the process", function() {
1495
+ // module(function($animateProvider) {
1496
+ // $animateProvider.register('.displayer', function($timeout) {
1497
+ // return {
1498
+ // removeClass : function(element, className, done) {
1499
+ // element.removeClass('hiding');
1500
+ // element.addClass('showing');
1501
+ // $timeout(done, 25, false);
1502
+ // },
1503
+ // addClass : function(element, className, done) {
1504
+ // element.removeClass('showing');
1505
+ // element.addClass('hiding');
1506
+ // $timeout(done, 555, false);
1507
+ // }
1508
+ // }
1509
+ // });
1510
+ // })
1511
+ // inject(function($compile, $rootScope, $animate, $sniffer, $timeout) {
1512
+ //
1513
+ // ss.addRule('.ng-hide-add', 'transition: 5s linear all;' +
1514
+ // vendorPrefix + 'transition: 5s linear all');
1515
+ // ss.addRule('.ng-hide-remove', 'transition: 5s linear all;' +
1516
+ // vendorPrefix + 'transition: 5s linear all');
1517
+ //
1518
+ // var element = html($compile('<div></div>')($rootScope));
1519
+ //
1520
+ // element.addClass('displayer');
1521
+ //
1522
+ // expect(element).toBeShown();
1523
+ // expect(element.hasClass('showing')).toBe(false);
1524
+ // expect(element.hasClass('hiding')).toBe(false);
1525
+ //
1526
+ // $animate.addClass(element, 'ng-hide');
1527
+ //
1528
+ // if($sniffer.transitions) {
1529
+ // expect(element).toBeShown(); //still showing
1530
+ // $timeout.flush();
1531
+ // expect(element).toBeShown();
1532
+ // $timeout.flushNext(5555);
1533
+ // }
1534
+ // $timeout.flush();
1535
+ // expect(element).toBeHidden();
1536
+ //
1537
+ // expect(element.hasClass('showing')).toBe(false);
1538
+ // expect(element.hasClass('hiding')).toBe(true);
1539
+ // $animate.removeClass(element, 'ng-hide');
1540
+ //
1541
+ // if($sniffer.transitions) {
1542
+ // expect(element).toBeHidden();
1543
+ // $timeout.flush();
1544
+ // expect(element).toBeHidden();
1545
+ // $timeout.flushNext(5580);
1546
+ // }
1547
+ // $timeout.flush();
1548
+ // expect(element).toBeShown();
1549
+ //
1550
+ // expect(element.hasClass('showing')).toBe(true);
1551
+ // expect(element.hasClass('hiding')).toBe(false);
1552
+ // });
1553
+ // });
1554
1554
1555
1555
it ( "should provide the correct CSS class to the addClass and removeClass callbacks within a JS animation" , function ( ) {
1556
1556
module ( function ( $animateProvider ) {
0 commit comments