Merge branch 'dev' 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/a1416183 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/a1416183 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/a1416183 Branch: refs/heads/master Commit: a14161834165a745625ae234e7024c48f424739c Parents: 671b6c5 db666a2 Author: gurisxie <279483...@qq.com> Authored: Tue Sep 26 01:17:04 2017 +0800 Committer: gurisxie <279483...@qq.com> Committed: Tue Sep 26 01:17:04 2017 +0800 ---------------------------------------------------------------------- doc/source/cn/guide/set-up-env.md | 64 ++++++++++++---------- doc/source/cn/references/modules/animation.md | 5 +- doc/source/guide/set-up-env.md | 58 +++++++++++--------- doc/source/references/modules/animation.md | 6 +- html5/render/vue/components/input.js | 2 +- start | 5 +- 6 files changed, 75 insertions(+), 65 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/a1416183/html5/render/vue/components/input.js ---------------------------------------------------------------------- diff --cc html5/render/vue/components/input.js index 0e8d466,e4d5952..a3e608b --- a/html5/render/vue/components/input.js +++ b/html5/render/vue/components/input.js @@@ -19,10 -19,12 +19,10 @@@ /** * @fileOverview Input component. - * Support v-model only if vue version is large than 2.2.0 + * Support v-model only if vue version is larger than 2.2.0 */ -import { extractComponentStyle, createEventMap } from '../core' -import { inputCommon } from '../mixins' -import { extend, mapFormEvents, appendCss } from '../utils' -// import { validateStyles } from '../validator' +let extractComponentStyle, createEventMap +let extend, mapFormEvents, appendCss const ID_PREFIX_PLACEHOLDER_COLOR = 'wipt_plc_' const ID_PREFIX_INPUT = 'wipt_'
