You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by fk...@apache.org on 2017/04/13 10:12:59 UTC
[1/2] incubator-weex git commit: * [jsfm] revert commit call C++
timer instead of WxTimerModule with in weex jsfm
Repository: incubator-weex
Updated Branches:
refs/heads/0.12-dev 3774b1bdf -> 8a7a1ad29
* [jsfm] revert commit call C++ timer instead of WxTimerModule with in weex jsfm
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/4bf77f5d
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/4bf77f5d
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/4bf77f5d
Branch: refs/heads/0.12-dev
Commit: 4bf77f5d5cbae677b7853f686148855de68ea3ca
Parents: 3774b1b
Author: fkysly <fk...@gmail.com>
Authored: Thu Apr 13 18:09:35 2017 +0800
Committer: fkysly <fk...@gmail.com>
Committed: Thu Apr 13 18:09:35 2017 +0800
----------------------------------------------------------------------
html5/frameworks/legacy/app/ctrl/init.js | 42 ++++-----------------------
1 file changed, 6 insertions(+), 36 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/4bf77f5d/html5/frameworks/legacy/app/ctrl/init.js
----------------------------------------------------------------------
diff --git a/html5/frameworks/legacy/app/ctrl/init.js b/html5/frameworks/legacy/app/ctrl/init.js
index c3c85f4..401d614 100644
--- a/html5/frameworks/legacy/app/ctrl/init.js
+++ b/html5/frameworks/legacy/app/ctrl/init.js
@@ -106,51 +106,21 @@ export function init (app, code, data, services) {
const handler = function () {
args[0](...args.slice(2))
}
-
- let timerId, callbackId
-
- if (global.setTimeoutWeex && (typeof global.setTimeoutWeex === 'function')) {
- callbackId = app.doc.taskCenter.normalize(handler)
- timerId = global.setTimeoutWeex(app.id, callbackId, args[1])
- return timerId
- }
- else {
- timer.setTimeout(handler, args[1])
- return app.doc.taskCenter.callbackManager.lastCallbackId.toString()
- }
+ timer.setTimeout(handler, args[1])
+ return app.doc.taskCenter.callbackManager.lastCallbackId.toString()
},
setInterval: (...args) => {
const handler = function () {
args[0](...args.slice(2))
}
-
- let timerId, callbackId
-
- if (global.setIntervalWeex && (typeof global.setIntervalWeex === 'function')) {
- callbackId = app.doc.taskCenter.normalize(handler)
- timerId = global.setIntervalWeex(app.id, callbackId, args[1])
- return timerId
- }
- else {
- timer.setInterval(handler, args[1])
- return app.doc.taskCenter.callbackManager.lastCallbackId.toString()
- }
+ timer.setInterval(handler, args[1])
+ return app.doc.taskCenter.callbackManager.lastCallbackId.toString()
},
clearTimeout: (n) => {
- if (global.clearTimeoutWeex && (typeof global.clearTimeoutWeex === 'function')) {
- global.clearTimeoutWeex(n)
- }
- else {
- timer.clearTimeout(n)
- }
+ timer.clearTimeout(n)
},
clearInterval: (n) => {
- if (global.clearIntervalWeex && (typeof global.clearIntervalWeex === 'function')) {
- global.clearIntervalWeex(n)
- }
- else {
- timer.clearInterval(n)
- }
+ timer.clearInterval(n)
}
})
}
[2/2] incubator-weex git commit: * [jsfm] v0.20.4
Posted by fk...@apache.org.
* [jsfm] v0.20.4
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/8a7a1ad2
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/8a7a1ad2
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/8a7a1ad2
Branch: refs/heads/0.12-dev
Commit: 8a7a1ad29a0fa3f02483b0c4675ea18c0e563e66
Parents: 4bf77f5
Author: fkysly <fk...@gmail.com>
Authored: Thu Apr 13 18:09:46 2017 +0800
Committer: fkysly <fk...@gmail.com>
Committed: Thu Apr 13 18:09:46 2017 +0800
----------------------------------------------------------------------
package.json | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/8a7a1ad2/package.json
----------------------------------------------------------------------
diff --git a/package.json b/package.json
index 3c0b799..53f65d8 100644
--- a/package.json
+++ b/package.json
@@ -3,7 +3,7 @@
"version": "0.4.0",
"subversion": {
"browser": "0.5.0",
- "framework": "0.20.3",
+ "framework": "0.20.4",
"vue-render": "0.11.5",
"transformer": ">=0.1.5 <0.5"
},
@@ -147,7 +147,7 @@
"rollup-watch": "^2.5.0",
"selenium-server": "2.53.1",
"serve": "^1.4.0",
- "sinon": "^1.17.4",
+ "sinon": "^2.1.0",
"sinon-chai": "^2.8.0",
"uglify-js": "^2.6.4",
"vue": "^2.2.6",