Permalink
Browse files

fix scroll page bug in picker

  • Loading branch information...
1 parent 57e5b94 commit 9954a141731e11b0c5923b302f3de571e171ff46 @lihongxun945 committed Mar 9, 2016
Showing with 25 additions and 2 deletions.
  1. +1 −0 .gitignore
  2. +1 −1 _config.yml
  3. +5 −0 docs/changelog.html
  4. +12 −0 docs/demos/picker.html
  5. +5 −0 js/picker.js
  6. +1 −1 package.json
View
@@ -7,3 +7,4 @@ dist/
.DS_Store
_site/*
*.orig
+*.log
View
@@ -3,7 +3,7 @@ name: light7
authors: 任行
description: Build mobile apps with simple HTML, CSS, and JS components.
favicon: http://gtms04.alicdn.com/tps/i4/TB17MaDGpXXXXb7apXXAz6UFXXX-16-16.png
-version: 0.4.1
+version: 0.4.2
# Dependencies
highlighter: rouge
View
@@ -22,6 +22,11 @@ <h2 class="page-title">Changelog</h2>
<h2>Changelog</h2>
+ <h3>v0.4.2 - 2016-03-12</h3>
+ <ul>
+ <li>Fixed bug: the entire page will scroll when touchmove on picker.</li>
+ </ul>
+
<h3>v0.4.1 - 2016-01-28</h3>
<ul>
<li>Fix router bug: JS error when use inline page.</li>
@@ -47,5 +47,17 @@ <h1 class="title">picker</h1>
</ul>
</div>
</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
+ <div class="content-block-title">Multi Col</div>
</div>
</div>
View
@@ -611,6 +611,11 @@
}
});
+ //修复picker会滚动页面的bug
+ $(document).on($.touchEvents.move, ".picker-modal-inner", function(e) {
+ e.preventDefault();
+ });
+
$.fn.picker = function(params) {
var args = arguments;
return this.each(function() {
View
@@ -1,7 +1,7 @@
{
"name": "light7",
"description": "Build mobile apps with simple HTML, CSS, and JS components.",
- "version": "0.4.1",
+ "version": "0.4.2",
"keywords": [
"light7",
"UI",

0 comments on commit 9954a14

Please sign in to comment.