refactor(Angular): add isPromiseLike helper function

shahata · jeffbcross · commit e6ebfc87c94d · 2014-07-22T16:35:02.000-07:00
This can be used internally to remove the repeating pattern of `obj &amp;&amp; obj.then`. For now, I don't see a good reason to expose this in angular's public interface.

Conflicts:
	src/Angular.js
diff --git a/lib/promises-aplus/promises-aplus-test-adapter.js b/lib/promises-aplus/promises-aplus-test-adapter.js
@@ -2,6 +2,7 @@
 'use strict';
 
 var isFunction = function isFunction(value){return typeof value == 'function';};
+var isPromiseLike = function isPromiseLike(obj) {return obj && isFunction(obj.then);};
 
 var $q = qFactory(process.nextTick, function noopExceptionHandler() {});
 
diff --git a/src/.jshintrc b/src/.jshintrc
@@ -50,6 +50,7 @@
     "isFile": false,
     "isBlob": false,
     "isBoolean": false,
+    "isPromiseLike": false,
     "trim": false,
     "isElement": false,
     "makeMap": false,
diff --git a/src/Angular.js b/src/Angular.js
@@ -46,6 +46,7 @@
     isFile: true,
     isBlob: true,
     isBoolean: true,
+    isPromiseLike: true,
     trim: true,
     isElement: true,
     makeMap: true,
@@ -582,6 +583,11 @@ function isBoolean(value) {
 }
 
 
+function isPromiseLike(obj) {
+  return obj && isFunction(obj.then);
+}
+
+
 var trim = (function() {
   // native trim is way faster: http://jsperf.com/angular-trim-test
   // but IE doesn't have it... :-(
diff --git a/src/ng/http.js b/src/ng/http.js
@@ -954,7 +954,7 @@ function $HttpProvider() {
       if (cache) {
         cachedResp = cache.get(url);
         if (isDefined(cachedResp)) {
-          if (cachedResp.then) {
+          if (isPromiseLike(cachedResp)) {
             // cached request has already been sent, but there is no response yet
             cachedResp.then(removePendingReq, removePendingReq);
             return cachedResp;
diff --git a/src/ng/httpBackend.js b/src/ng/httpBackend.js
@@ -132,7 +132,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc
 
     if (timeout > 0) {
       var timeoutId = $browserDefer(timeoutRequest, timeout);
-    } else if (timeout && timeout.then) {
+    } else if (isPromiseLike(timeout)) {
       timeout.then(timeoutRequest);
     }
 
diff --git a/src/ng/q.js b/src/ng/q.js
@@ -303,7 +303,7 @@ function qFactory(nextTick, exceptionHandler) {
             } catch(e) {
               return makePromise(e, false);
             }
-            if (callbackOutput && isFunction(callbackOutput.then)) {
+            if (isPromiseLike(callbackOutput)) {
               return callbackOutput.then(function() {
                 return makePromise(value, isResolved);
               }, function(error) {
@@ -328,7 +328,7 @@ function qFactory(nextTick, exceptionHandler) {
 
 
   var ref = function(value) {
-    if (value && isFunction(value.then)) return value;
+    if (isPromiseLike(value)) return value;
     return {
       then: function(callback) {
         var result = defer();

Original file line number	Diff line number	Diff line change
`@@ -132,7 +132,7 @@ function createHttpBackend($browser, createXhr, $browserDefer, callbacks, rawDoc`
`132`	`132`
`133`	`133`	`if (timeout > 0) {`
`134`	`134`	`var timeoutId = $browserDefer(timeoutRequest, timeout);`
`135`		`- } else if (timeout && timeout.then) {`
	`135`	`+ } else if (isPromiseLike(timeout)) {`
`136`	`136`	`timeout.then(timeoutRequest);`
`137`	`137`	`}`
`138`	`138`