feat($parse): allow for assignments in ternary operator branches

rodyhaddad · petebacondarwin · commit 93b0c2d8925e · 2014-08-11T17:04:40.000+01:00
Closes angular#8512 Closes angular#8484 CLoses angular#5434 Conflicts: test/ng/parseSpec.js
diff --git a/src/ng/parse.js b/src/ng/parse.js
@@ -606,9 +606,9 @@ Parser.prototype = {
     var middle;
     var token;
     if ((token = this.expect('?'))) {
-      middle = this.ternary();
+      middle = this.assignment();
       if ((token = this.expect(':'))) {
-        return this.ternaryFn(left, middle, this.ternary());
+        return this.ternaryFn(left, middle, this.assignment());
       } else {
         this.throwError('expected :', token);
       }
diff --git a/test/ng/parseSpec.js b/test/ng/parseSpec.js
@@ -434,6 +434,17 @@ describe('parser', function() {
           expect(scope.b).toEqual(234);
         });
 
+        it('should evaluate assignments in ternary operator', function() {
+          scope.$eval('a = 1 ? 2 : 3');
+          expect(scope.a).toBe(2);
+
+          scope.$eval('0 ? a = 2 : a = 3');
+          expect(scope.a).toBe(3);
+
+          scope.$eval('1 ? a = 2 : a = 3');
+          expect(scope.a).toBe(2);
+        });
+
         it('should evaluate function call without arguments', function() {
           scope['const'] =  function(a,b){return 123;};
           expect(scope.$eval("const()")).toEqual(123);
