You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by gu...@apache.org on 2017/09/26 09:13:43 UTC
[1/2] incubator-weex git commit: * [html5] add custom jsonp callback
name support
Repository: incubator-weex
Updated Branches:
refs/heads/0.16-dev c76b93859 -> d43a7a9d4
* [html5] add custom jsonp callback name support
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/5f5fdd71
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/5f5fdd71
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/5f5fdd71
Branch: refs/heads/0.16-dev
Commit: 5f5fdd71eecc7b34f9fa7978db622c53c8723d3e
Parents: e52d273
Author: Yujingyi <34...@qq.com>
Authored: Wed Sep 20 16:16:13 2017 +0800
Committer: Yujingyi <34...@qq.com>
Committed: Wed Sep 20 16:16:13 2017 +0800
----------------------------------------------------------------------
html5/render/browser/extend/api/stream.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/5f5fdd71/html5/render/browser/extend/api/stream.js
----------------------------------------------------------------------
diff --git a/html5/render/browser/extend/api/stream.js b/html5/render/browser/extend/api/stream.js
index 8e27dd7..d843a10 100644
--- a/html5/render/browser/extend/api/stream.js
+++ b/html5/render/browser/extend/api/stream.js
@@ -30,7 +30,7 @@ let jsonpCnt = 0
const ERROR_STATE = -1
function _jsonp (config, callback, progressCallback) {
- const cbName = 'jsonp_' + (++jsonpCnt)
+ const cbName = config.jsonpCallbackName || 'jsonp_' + (++jsonpCnt)
let url
if (!config.url) {
[2/2] incubator-weex git commit: Merge branch '0.16-dev' of
https://github.com/orifake/incubator-weex into 0.16-dev
Posted by gu...@apache.org.
Merge branch '0.16-dev' of https://github.com/orifake/incubator-weex into 0.16-dev
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/d43a7a9d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/d43a7a9d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/d43a7a9d
Branch: refs/heads/0.16-dev
Commit: d43a7a9d46fc67591cdf7e0a6877dc03405d91e0
Parents: c76b938 5f5fdd7
Author: gurisxie <27...@qq.com>
Authored: Tue Sep 26 17:13:28 2017 +0800
Committer: gurisxie <27...@qq.com>
Committed: Tue Sep 26 17:13:28 2017 +0800
----------------------------------------------------------------------
html5/render/browser/extend/api/stream.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------