修复o2.promiseAll方法

b227d951 · NoSubject · 917c1ba2 · b227d951
隐藏空白更改
内联并排

Showing with 2 addition and 2 deletion

o2web/source/o2_core/o2.js o2web/source/o2_core/o2.js +2 -2

未找到文件。
--- a/o2web/source/o2_core/o2.js
+++ b/o2web/source/o2_core/o2.js
@@ -1973,7 +1973,7 @@ if (window.Promise && !Promise.any){
                    "then": function(s){
                        if (s){
                            var r = s(p);
-                            return r || this;
+                            return (r.then && o2.typeOf(r.then)=="function") ?  r : this;
                        }
                        return this;
                    }
@@ -1987,7 +1987,7 @@ if (window.Promise && !Promise.any){
                    "then": function(s){
                        if (s){
                            var r = s(p);
-                            return r || this;
+                            return (r.then && o2.typeOf(r.then)=="function") ?  r : this;
                        }
                        return this;
                    }