Skip to content

Commit be7bd49

Browse files
hbcui1984hbcui1984
committed
编译至mui v2.4.0
1 parent 0cd3627 commit be7bd49

34 files changed

+359
-214
lines changed

Diff for: ‎dist/css/mui.css

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* =====================================================
3-
* Mui v2.3.0 (https://github.com/dcloudio/mui)
3+
* Mui v2.4.0 (https://github.com/dcloudio/mui)
44
* =====================================================
55
*/
66

@@ -1954,6 +1954,10 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
19541954

19551955
background-color: #c8c7cc;
19561956
}
1957+
.mui-table-view:before
1958+
{
1959+
top: -1px;
1960+
}
19571961

19581962
.mui-table-view-icon .mui-table-view-cell .mui-navigate-right .mui-icon
19591963
{
@@ -2068,8 +2072,6 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
20682072

20692073
padding: 11px 15px;
20702074

2071-
background-color: inherit;
2072-
20732075
-webkit-touch-callout: none;
20742076
}
20752077
.mui-table-view-cell:after
@@ -3914,6 +3916,7 @@ select:focus
39143916
height: 100%;
39153917

39163918
vertical-align: top;
3919+
white-space: normal;
39173920
}
39183921
.mui-slider .mui-slider-group .mui-slider-item > a:not(.mui-control-item)
39193922
{

Diff for: ‎dist/css/mui.min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎dist/js/mui.js

+20-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* =====================================================
3-
* Mui v2.3.0 (https://github.com/dcloudio/mui)
3+
* Mui v2.4.0 (https://github.com/dcloudio/mui)
44
* =====================================================
55
*/
66
/**
@@ -748,7 +748,8 @@ var mui = (function(document, undefined) {
748748
}
749749
}
750750
var target = e.target;
751-
if (target.tagName && target.tagName === 'INPUT' && (target.type === 'text' || target.type === 'search' || target.type === 'number')) {
751+
//TODO 需考虑所有键盘弹起的情况
752+
if (target.tagName && (target.tagName === 'TEXTAREA' || (target.tagName === 'INPUT' && (target.type === 'text' || target.type === 'search' || target.type === 'number')))) {
752753
if (target.disabled || target.readOnly) {
753754
return;
754755
}
@@ -3440,7 +3441,6 @@ var mui = (function(document, undefined) {
34403441
}
34413442
},
34423443
_start: function(e) {
3443-
e.target && !this._preventDefaultException(e.target, this.options.preventDefaultException) && e.preventDefault();
34443444
this.moved = this.needReset = false;
34453445
this._transitionTime();
34463446
if (this.isInTransition) {
@@ -4085,6 +4085,10 @@ var mui = (function(document, undefined) {
40854085
}
40864086
},
40874087
_start: function(e) {
4088+
//仅下拉刷新在start阻止默认事件
4089+
if (e.touches && e.touches.length && e.touches[0].clientX > 30) {
4090+
e.target && !this._preventDefaultException(e.target, this.options.preventDefaultException) && e.preventDefault();
4091+
}
40884092
if (!this.loading) {
40894093
this.pulldown = this.pullPocket = this.pullCaption = this.pullLoading = false
40904094
}
@@ -4638,6 +4642,7 @@ var mui = (function(document, undefined) {
46384642
var self = this;
46394643
// document.addEventListener('plusscrollbottom', this);
46404644
window.addEventListener('dragup', self);
4645+
document.addEventListener("plusscrollbottom", self);
46414646
self.scrollInterval = window.setInterval(function() {
46424647
if (self.isScroll && !self.loading) {
46434648
if (window.pageYOffset + window.innerHeight + 10 >= document.documentElement.scrollHeight) {
@@ -4705,7 +4710,7 @@ var mui = (function(document, undefined) {
47054710
// }
47064711
// }
47074712
self.isScroll = false;
4708-
if (e.type === 'dragup') {
4713+
if (e.type === 'dragup' || e.type === 'plusscrollbottom') {
47094714
self.isScroll = true;
47104715
setTimeout(function() {
47114716
self.isScroll = false;
@@ -5583,10 +5588,11 @@ var mui = (function(document, undefined) {
55835588

55845589
return element;
55855590
}());
5591+
var removeBackdropTimer;
55865592
var removeBackdrop = function(popover) {
55875593
backdrop.setAttribute('style', 'opacity:0');
55885594
$.targets.popover = $.targets._popover = null; //reset
5589-
setTimeout(function() {
5595+
removeBackdropTimer = $.later(function() {
55905596
if (!popover.classList.contains(CLASS_ACTIVE) && backdrop.parentNode && backdrop.parentNode === document.body) {
55915597
document.body.removeChild(backdrop);
55925598
}
@@ -5611,6 +5617,7 @@ var mui = (function(document, undefined) {
56115617
});
56125618

56135619
var togglePopover = function(popover, anchor) {
5620+
removeBackdropTimer && removeBackdropTimer.cancel(); //取消remove的timer
56145621
//remove一遍，以免来回快速切换，导致webkitTransitionEnd不触发，无法remove
56155622
popover.removeEventListener('webkitTransitionEnd', onPopoverShown);
56165623
popover.removeEventListener('webkitTransitionEnd', onPopoverHidden);
@@ -7011,8 +7018,16 @@ var mui = (function(document, undefined) {
70117018
});
70127019
self.input.addEventListener(changeEventName, function(event) {
70137020
self.checkValue();
7021+
$.trigger(self, changeEventName, self.getValue());
70147022
});
70157023
},
7024+
/**
7025+
* 获取当前值
7026+
**/
7027+
getValue: function() {
7028+
var self = this;
7029+
return parseInt(self.input.value);
7030+
},
70167031
/**
70177032
* 验证当前值是法合法
70187033
**/

Diff for: ‎dist/js/mui.min.js

+5-5
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎examples/hello-mui/css/mui.css

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
/*!
22
* =====================================================
3-
* Mui v2.3.0 (https://github.com/dcloudio/mui)
3+
* Mui v2.4.0 (https://github.com/dcloudio/mui)
44
* =====================================================
55
*/
66

@@ -1954,6 +1954,10 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
19541954

19551955
background-color: #c8c7cc;
19561956
}
1957+
.mui-table-view:before
1958+
{
1959+
top: -1px;
1960+
}
19571961

19581962
.mui-table-view-icon .mui-table-view-cell .mui-navigate-right .mui-icon
19591963
{
@@ -2068,8 +2072,6 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
20682072

20692073
padding: 11px 15px;
20702074

2071-
background-color: inherit;
2072-
20732075
-webkit-touch-callout: none;
20742076
}
20752077
.mui-table-view-cell:after
@@ -3914,6 +3916,7 @@ select:focus
39143916
height: 100%;
39153917

39163918
vertical-align: top;
3919+
white-space: normal;
39173920
}
39183921
.mui-slider .mui-slider-group .mui-slider-item > a:not(.mui-control-item)
39193922
{

Diff for: ‎examples/hello-mui/css/mui.min.css

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Diff for: ‎examples/hello-mui/examples/info.html

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@
2626
</style>
2727
</head>
2828
<body>
29-
<!--<header class="mui-bar mui-bar-nav">
30-
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
31-
<h1 class="mui-title">关于</h1>
29+
<!--<header class="mui-bar mui-bar-nav">
30+
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
31+
<h1 class="mui-title">关于</h1>
3232
</header>-->
3333
<div class="mui-content">
3434
<div class="mui-content-padded">
@@ -48,7 +48,7 @@ <h4>新手指南</h4>
4848
</p>
4949
<p>更多详细介绍，请到<a href="http://dcloudio.github.io/mui">mui官网</a>查看；</p>
5050
<h4>版本介绍</h4>
51-
<p>当前版本为2.3.0，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
51+
<p>当前版本为2.4.0，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
5252
<h4>License</h4>
5353
<p>
5454
mui遵循MIT License，源码已提交至Github，<a href="https://github.com/dcloudio/mui">点击查看</a>;

Diff for: ‎examples/hello-mui/examples/lazyload-image.html

+70-70
Original file line numberDiff line numberDiff line change
@@ -1,73 +1,73 @@
1-
<!DOCTYPE html>
2-
<html>
3-
4-
<head>
5-
<meta charset="utf-8">
6-
<title>Hello MUI</title>
7-
<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
8-
<meta name="apple-mobile-web-app-capable" content="yes">
9-
<meta name="apple-mobile-web-app-status-bar-style" content="black">
10-
11-
<!--标准mui.css-->
12-
<link rel="stylesheet" href="../css/mui.min.css">
13-
<!--App自定义的css-->
14-
<link rel="stylesheet" type="text/css" href="../css/app.css"/>
15-
<style type="text/css">
16-
p{
17-
text-indent: 22px;
1+
<!DOCTYPE html>
2+
<html>
3+
4+
<head>
5+
<meta charset="utf-8">
6+
<title>Hello MUI</title>
7+
<meta name="viewport" content="width=device-width, initial-scale=1,maximum-scale=1,user-scalable=no">
8+
<meta name="apple-mobile-web-app-capable" content="yes">
9+
<meta name="apple-mobile-web-app-status-bar-style" content="black">
10+
11+
<!--标准mui.css-->
12+
<link rel="stylesheet" href="../css/mui.min.css">
13+
<!--App自定义的css-->
14+
<link rel="stylesheet" type="text/css" href="../css/app.css" />
15+
<style type="text/css">
16+
p {
17+
text-indent: 22px;
1818
}
19-
.des {
20-
margin: .5em 0;
21-
}
22-
.des>li {
23-
font-size: 14px;
24-
color: #8f8f94;
19+
.des {
20+
margin: .5em 0;
2521
}
26-
</style>
27-
</head>
28-
29-
<body>
30-
<header class="mui-bar mui-bar-nav">
31-
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
32-
<h1 class="mui-title">lazyload（延迟加载） </h1>
33-
</header>
34-
<div class="mui-content">
35-
<div class="mui-content-padded">
36-
<p>延迟加载的理念：页面初始化时，暂不加载处于屏幕可见区域之外的图片。该方案会有如下几大好处：</p>
37-
<ul class="des">
38-
<li>加快页面渲染速度</li>
39-
<li>提升页面滚动性能</li>
40-
<li>默认不下载屏幕外的图片，减少网络流量</li>
41-
</ul>
42-
</div>
43-
<ul id="list" class="mui-table-view mui-table-view-chevron">
44-
45-
</ul>
46-
</div>
47-
</body>
48-
<script src="../js/mui.min.js "></script>
49-
<script src="../js/mui.lazyload.js"></script>
50-
<script src="../js/mui.lazyload.img.js"></script>
51-
<script>
52-
mui.init();
53-
var createFragment = function(count) {
54-
var fragment = document.createDocumentFragment();
55-
var li;
56-
for (var i = 0; i < count; i++) {
57-
li = document.createElement('li');
58-
li.className = 'mui-table-view-cell mui-media';
59-
li.innerHTML = '<a class="mui-navigate-right"><img class="mui-media-object mui-pull-left" data-lazyload="http://www.dcloud.io/hellomui/images/'+(i%5+1)+'.jpg?version='+Math.random()*1000+'"><div class="mui-media-body">主标题<p class="mui-ellipsis">列表二级标题</p></div></a>';
60-
fragment.appendChild(li);
61-
}
62-
return fragment;
63-
};
64-
(function($) {
65-
var list = document.getElementById("list");
66-
list.appendChild(createFragment(50));
67-
$(document).imageLazyload({
68-
placeholder: '../images/60x60.gif'
69-
});
70-
})(mui);
71-
</script>
72-
22+
.des>li {
23+
font-size: 14px;
24+
color: #8f8f94;
25+
}
26+
</style>
27+
</head>
28+
29+
<body>
30+
<header class="mui-bar mui-bar-nav">
31+
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
32+
<h1 class="mui-title">lazyload（延迟加载） </h1>
33+
</header>
34+
<div class="mui-content">
35+
<div class="mui-content-padded">
36+
<p>延迟加载的理念：页面初始化时，暂不加载处于屏幕可见区域之外的图片。该方案会有如下几大好处：</p>
37+
<ul class="des">
38+
<li>加快页面渲染速度</li>
39+
<li>提升页面滚动性能</li>
40+
<li>默认不下载屏幕外的图片，减少网络流量</li>
41+
</ul>
42+
</div>
43+
<ul id="list" class="mui-table-view mui-table-view-chevron">
44+
45+
</ul>
46+
</div>
47+
</body>
48+
<script src="../js/mui.min.js "></script>
49+
<script src="../js/mui.lazyload.js"></script>
50+
<script src="../js/mui.lazyload.img.js"></script>
51+
<script>
52+
mui.init();
53+
var createFragment = function(count) {
54+
var fragment = document.createDocumentFragment();
55+
var li;
56+
for (var i = 0; i < count; i++) {
57+
li = document.createElement('li');
58+
li.className = 'mui-table-view-cell mui-media';
59+
li.innerHTML = '<a class="mui-navigate-right"><img class="mui-media-object mui-pull-left" data-lazyload="http://www.dcloud.io/hellomui/images/' + (i % 5 + 1) + '.jpg?version=' + Math.random() * 1000 + '"><div class="mui-media-body">主标题<p class="mui-ellipsis">列表二级标题</p></div></a>';
60+
fragment.appendChild(li);
61+
}
62+
return fragment;
63+
};
64+
(function($) {
65+
var list = document.getElementById("list");
66+
list.appendChild(createFragment(50));
67+
$(document).imageLazyload({
68+
placeholder: '../images/60x60.gif'
69+
});
70+
})(mui);
71+
</script>
72+
7373
</html>

Diff for: ‎examples/hello-mui/examples/numbox.html

+7-13
Original file line numberDiff line numberDiff line change
@@ -57,10 +57,10 @@ <h5 class="mui-content-padded">设定步长值(步长 10)</h5>
5757
<h5 class="mui-content-padded">取值操作</h5>
5858
<div class="mui-numbox">
5959
<button class="mui-btn mui-numbox-btn-minus" type="button">-</button>
60-
<input id="testBox" class="mui-numbox-input" type="number" />
60+
<input id="box" class="mui-numbox-input" type="number" />
6161
<button class="mui-btn mui-numbox-btn-plus" type="button">+</button>
6262
</div>
63-
<button id="getValue" class="mui-btn" style="padding: 7px 12px;">取当前值</button>
63+
<button id="btn" class="mui-btn" style="padding: 7px 12px;">取当前值</button>
6464
<h5 class="mui-content-padded">在行内</h5> 购买数量:
6565
<div class="mui-numbox">
6666
<button class="mui-btn mui-numbox-btn-minus" type="button">-</button>
@@ -99,17 +99,11 @@ <h5 class="mui-content-padded">通过样式定义大小(220x60)</h5>
9999
</div>
100100
</div>
101101
<script src="../js/mui.min.js"></script>
102-
<script>
103-
(function($, doc) {
104-
$.init();
105-
$.plusReady(function() {
106-
var btnGetValue = doc.querySelector('#getValue');
107-
var boxTest = doc.querySelector('#testBox');
108-
btnGetValue.addEventListener('click', function(event) {
109-
plus.nativeUI.alert('当前值: ' + boxTest.value, null, "提示");
110-
});
111-
});
112-
}(mui, document));
102+
<script>
103+
mui.init();
104+
document.getElementById("btn").addEventListener('tap', function(event) {
105+
mui.alert('当前值: ' + document.getElementById("box").value, null, "提示");
106+
});
113107
</script>
114108
</body>
115109

Diff for: ‎examples/hello-mui/examples/picker.html

+6-6
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
<link rel="stylesheet" href="../css/mui.min.css">
1010
<!--App自定义的css-->
1111
<link rel="stylesheet" type="text/css" href="../css/app.css" />
12-
<!--<link href="../css/mui.picker.css" rel="stylesheet" />
13-
<link href="../css/mui.poppicker.css" rel="stylesheet" />-->
14-
<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />
12+
<link href="../css/mui.picker.css" rel="stylesheet" />
13+
<link href="../css/mui.poppicker.css" rel="stylesheet" />
14+
<!--<link rel="stylesheet" type="text/css" href="../css/mui.picker.min.css" />-->
1515
<style>
1616
.mui-btn {
1717
font-size: 16px;
@@ -61,9 +61,9 @@ <h5 class="mui-content-padded">级联示例</h5>
6161
</div>
6262
</div>
6363
<script src="../js/mui.min.js"></script>
64-
<script src="../js/mui.picker.min.js"></script>
65-
<!--<script src="../js/mui.picker.js"></script>
66-
<script src="../js/mui.poppicker.js"></script>-->
64+
<!--<script src="../js/mui.picker.min.js"></script>-->
65+
<script src="../js/mui.picker.js"></script>
66+
<script src="../js/mui.poppicker.js"></script>
6767
<script src="../js/city.data.js" type="text/javascript" charset="utf-8"></script>
6868
<script src="../js/city.data-3.js" type="text/javascript" charset="utf-8"></script>
6969
<script>

0 commit comments

Comments
 (0)