Merge branch 'dev-web-slider-neighbor' into 0.12-dev-web
Project: http://git-wip-us.apache.org/repos/asf/incubator-weex/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-weex/commit/b0404965 Tree: http://git-wip-us.apache.org/repos/asf/incubator-weex/tree/b0404965 Diff: http://git-wip-us.apache.org/repos/asf/incubator-weex/diff/b0404965 Branch: refs/heads/0.12-dev Commit: b0404965abf2d4873ed9963ca52ff8ee31bc0f53 Parents: bf99deb 1a53bcd Author: MrRaindrop <tekk...@gmail.com> Authored: Thu Apr 13 11:49:34 2017 +0800 Committer: MrRaindrop <tekk...@gmail.com> Committed: Thu Apr 13 11:49:34 2017 +0800 ---------------------------------------------------------------------- html5/render/vue/components/index.js | 8 +- .../render/vue/components/slider/slideMixin.js | 59 ++++-- .../vue/components/slider/slider-neighbor.css | 21 +++ .../vue/components/slider/slider-neighbor.js | 182 +++++++++++++++++++ html5/render/vue/index.js | 2 +- html5/render/vue/utils/style.js | 41 +++++ 6 files changed, 298 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/components/index.js ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/components/slider/slideMixin.js ---------------------------------------------------------------------- diff --cc html5/render/vue/components/slider/slideMixin.js index f887bfb,13285e8..6edb469 --- a/html5/render/vue/components/slider/slideMixin.js +++ b/html5/render/vue/components/slider/slideMixin.js @@@ -1,22 -1,4 +1,22 @@@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ - import { createEvent/*, nextFrame*/, fireLazyload } from '../../utils' + import { createEvent/*, nextFrame*/, fireLazyload, addTransform } from '../../utils' const TRANSITION_TIME = 200 http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/index.js ---------------------------------------------------------------------- diff --cc html5/render/vue/index.js index 8e06bb8,937092f..7f158dc --- a/html5/render/vue/index.js +++ b/html5/render/vue/index.js @@@ -1,24 -1,7 +1,24 @@@ -// import semver from 'semver' +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ import weex from './env' import { setVue } from './env' - import * as components from './components' + import components from './components' import { base, style } from './mixins' // import styleMixin from './mixins/style' http://git-wip-us.apache.org/repos/asf/incubator-weex/blob/b0404965/html5/render/vue/utils/style.js ----------------------------------------------------------------------
