File tree 2 files changed +11
-1
lines changed
2 files changed +11
-1
lines changed Original file line number Diff line number Diff line change @@ -985,6 +985,7 @@ ASTCompiler.prototype = {
985
985
recursionFn ( intoId ) ;
986
986
} , function ( ) {
987
987
self . assign ( intoId , 'undefined' ) ;
988
+ recursionFn ( intoId ) ;
988
989
} ) ;
989
990
} , ! ! create ) ;
990
991
break ;
@@ -1024,6 +1025,9 @@ ASTCompiler.prototype = {
1024
1025
expression = self . ensureSafeObject ( expression ) ;
1025
1026
self . assign ( intoId , expression ) ;
1026
1027
recursionFn ( intoId ) ;
1028
+ } , function ( ) {
1029
+ self . assign ( intoId , 'undefined' ) ;
1030
+ recursionFn ( intoId ) ;
1027
1031
} ) ;
1028
1032
} ) ;
1029
1033
}
Original file line number Diff line number Diff line change @@ -1741,14 +1741,20 @@ describe('parser', function() {
1741
1741
expect ( scope . $eval ( "3 >= 3 > 2" ) ) . toEqual ( 3 >= 3 > 2 ) ;
1742
1742
} ) ;
1743
1743
1744
- it ( 'should parse logical' , function ( ) {
1744
+ iit ( 'should parse logical' , function ( ) {
1745
1745
expect ( scope . $eval ( "0&&2" ) ) . toEqual ( 0 && 2 ) ;
1746
1746
expect ( scope . $eval ( "0||2" ) ) . toEqual ( 0 || 2 ) ;
1747
1747
expect ( scope . $eval ( "0||1&&2" ) ) . toEqual ( 0 || 1 && 2 ) ;
1748
1748
expect ( scope . $eval ( "true&&a" ) ) . toEqual ( true && undefined ) ;
1749
+ expect ( scope . $eval ( "true&&a()" ) ) . toEqual ( true && undefined ) ;
1750
+ expect ( scope . $eval ( "true&&a()()" ) ) . toEqual ( true && undefined ) ;
1749
1751
expect ( scope . $eval ( "true&&a.b" ) ) . toEqual ( true && undefined ) ;
1752
+ expect ( scope . $eval ( "true&&a.b.c" ) ) . toEqual ( true && undefined ) ;
1750
1753
expect ( scope . $eval ( "false||a" ) ) . toEqual ( false || undefined ) ;
1754
+ expect ( scope . $eval ( "false||a()" ) ) . toEqual ( false || undefined ) ;
1755
+ expect ( scope . $eval ( "false||a()()" ) ) . toEqual ( false || undefined ) ;
1751
1756
expect ( scope . $eval ( "false||a.b" ) ) . toEqual ( false || undefined ) ;
1757
+ expect ( scope . $eval ( "false||a.b.c" ) ) . toEqual ( false || undefined ) ;
1752
1758
} ) ;
1753
1759
1754
1760
it ( 'should parse ternary' , function ( ) {
You can’t perform that action at this time.
0 commit comments