Skip to content
This repository has been archived by the owner on Jun 3, 2021. It is now read-only.

[jsfm] Also enable the promise polyfill on Android #2704

Merged
merged 1 commit into from
Jul 15, 2019
Merged

[jsfm] Also enable the promise polyfill on Android #2704

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
"name": "weex",
"version": "0.12.2",
"subversion": {
"framework": "0.29.6",
"framework": "0.29.7",
"transformer": ">=0.1.5 <0.5"
},
"description": "A framework for building Mobile cross-platform UI",
Expand Down
2 changes: 1 addition & 1 deletion runtime/shared/polyfill/promise.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const { WXEnvironment } = global

/* istanbul ignore next */
if (typeof WXEnvironment !== 'undefined'
&& WXEnvironment.platform === 'iOS'
&& (WXEnvironment.platform === 'iOS' || WXEnvironment.platform === 'android')
&& !WXEnvironment.__enable_native_promise__) {
global.Promise = undefined
}