From b6a37d112b3e1478f4d14a5f82faabf700443748 Mon Sep 17 00:00:00 2001
From: Igor Minar <igor@angularjs.org>
Date: Wed, 9 Oct 2013 09:54:10 -0700
Subject: [PATCH] revert: fix($parse): handle promises returned from parsed
 function calls

This reverts commit 3a65822023119b71deab5e298c7ef2de204caa13.

The change cased regressions in third party components that require
promises from getter functions not to be unwrapped.

Since we have deprecated the promise unwrapping support in $parse it
doesn't make much sense to fix this issue and deal with regressions in
third party code.

Closes #4158
---
 src/ng/parse.js      | 10 ----------
 test/ng/parseSpec.js | 12 ------------
 2 files changed, 22 deletions(-)

diff --git a/src/ng/parse.js b/src/ng/parse.js
index aad740e23af1..403442560e4b 100644
--- a/src/ng/parse.js
+++ b/src/ng/parse.js
@@ -761,16 +761,6 @@ Parser.prototype = {
             ? fnPtr.apply(context, args)
             : fnPtr(args[0], args[1], args[2], args[3], args[4]);
 
-      // Check for promise
-      if (v && v.then && parser.options.unwrapPromises) {
-        var p = v;
-        if (!('$$v' in v)) {
-          p.$$v = undefined;
-          p.then(function(val) { p.$$v = val; });
-        }
-        v = v.$$v;
-      }
-
       return ensureSafeObject(v, parser.text);
     };
   },
diff --git a/test/ng/parseSpec.js b/test/ng/parseSpec.js
index 277178a1afc1..940bd6d6f6e6 100644
--- a/test/ng/parseSpec.js
+++ b/test/ng/parseSpec.js
@@ -1129,18 +1129,6 @@ describe('parser', function() {
             expect(scope.$eval('greeting')).toBe(undefined);
           });
 
-          it('should evaluate a function call returning a promise and eventually get its return value', function() {
-            scope.greetingFn = function() { return promise; };
-            expect(scope.$eval('greetingFn()')).toBe(undefined);
-
-            scope.$digest();
-            expect(scope.$eval('greetingFn()')).toBe(undefined);
-
-            deferred.resolve('hello!');
-            expect(scope.$eval('greetingFn()')).toBe(undefined);
-            scope.$digest();
-            expect(scope.$eval('greetingFn()')).toBe('hello!');
-          });
 
           describe('assignment into promises', function() {
             // This behavior is analogous to assignments to non-promise values