You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@weex.apache.org by ta...@apache.org on 2017/06/27 10:20:44 UTC
[1/3] incubator-weex git commit: * [jsfm] remove console hack on
android
Repository: incubator-weex
Updated Branches:
refs/heads/0.15-dev b549a22f8 -> 43bd95bb3
* [jsfm] remove console hack on android
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/e82ccf06
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/e82ccf06
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/e82ccf06
Branch: refs/heads/0.15-dev
Commit: e82ccf061fd19f92e3723ce1e807814fc95a63a8
Parents: f76eae4
Author: Hanks <zh...@gmail.com>
Authored: Mon Jun 26 11:32:36 2017 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Mon Jun 26 11:32:36 2017 +0800
----------------------------------------------------------------------
html5/shared/console.js | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/e82ccf06/html5/shared/console.js
----------------------------------------------------------------------
diff --git a/html5/shared/console.js b/html5/shared/console.js
index fdbee58..f7327f5 100644
--- a/html5/shared/console.js
+++ b/html5/shared/console.js
@@ -39,7 +39,7 @@ export function setNativeConsole () {
/* istanbul ignore next */
if (
- typeof global.console === 'undefined' || // Android
+ // typeof global.console === 'undefined' || // Android // remove android hack
(global.WXEnvironment && global.WXEnvironment.platform === 'iOS') // iOS
) {
global.console = {
[2/3] incubator-weex git commit: * [jsfm] fix console api on android
Posted by ta...@apache.org.
* [jsfm] fix console api on android
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/aac4eebe
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/aac4eebe
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/aac4eebe
Branch: refs/heads/0.15-dev
Commit: aac4eebebe8cd46c440d95061f292467a5000485
Parents: e82ccf0
Author: Hanks <zh...@gmail.com>
Authored: Mon Jun 26 15:48:49 2017 +0800
Committer: Hanks <zh...@gmail.com>
Committed: Mon Jun 26 15:48:49 2017 +0800
----------------------------------------------------------------------
html5/shared/console.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/aac4eebe/html5/shared/console.js
----------------------------------------------------------------------
diff --git a/html5/shared/console.js b/html5/shared/console.js
index f7327f5..eb54815 100644
--- a/html5/shared/console.js
+++ b/html5/shared/console.js
@@ -38,10 +38,8 @@ export function setNativeConsole () {
generateLevelMap()
/* istanbul ignore next */
- if (
- // typeof global.console === 'undefined' || // Android // remove android hack
- (global.WXEnvironment && global.WXEnvironment.platform === 'iOS') // iOS
- ) {
+ // mock console in native environment
+ if (global.WXEnvironment && global.WXEnvironment.platform !== 'Web') {
global.console = {
debug: (...args) => {
if (checkLevel('debug')) { global.nativeLog(...format(args), '__DEBUG') }
@@ -60,7 +58,9 @@ export function setNativeConsole () {
}
}
}
- else { // HTML5 or Node
+
+ // Web or Node
+ else {
const { debug, log, info, warn, error } = console
console.__ori__ = { debug, log, info, warn, error }
console.debug = (...args) => {
[3/3] incubator-weex git commit: Merge branch 'native-log' of
https://github.com/Hanks10100/incubator-weex into 0.15-dev
Posted by ta...@apache.org.
Merge branch 'native-log' of https://github.com/Hanks10100/incubator-weex into 0.15-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/43bd95bb
Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/43bd95bb
Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/43bd95bb
Branch: refs/heads/0.15-dev
Commit: 43bd95bb3a67eff44bc7776d55e3876eb4ef2634
Parents: b549a22 aac4eeb
Author: tancy <ro...@gmail.com>
Authored: Tue Jun 27 18:20:25 2017 +0800
Committer: tancy <ro...@gmail.com>
Committed: Tue Jun 27 18:20:25 2017 +0800
----------------------------------------------------------------------
html5/shared/console.js | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------