Skip to content

Commit

Permalink
编译至mui v1.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
@hbcui1984
hbcui1984 committed Jan 27, 2015
1 parent 3d43667 commit 003cc9c
Show file tree
Hide file tree
Showing 8 changed files with 196 additions and 83 deletions.
3 changes: 2 additions & 1 deletion dist/css/mui.css
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* =====================================================
* Mui v1.1.0 (https://github.com/dcloudio/mui)
* Mui v1.1.1 (https://github.com/dcloudio/mui)
* =====================================================
*/

Expand Down Expand Up @@ -320,6 +320,7 @@ a:active {
display: -webkit-box;
overflow: hidden;
text-overflow: ellipsis;
word-wrap: break-word;
white-space: normal !important;

-webkit-line-clamp: 2;
Expand Down
4 changes: 2 additions & 2 deletions dist/css/mui.min.css
View file

Large diffs are not rendered by default.

175 changes: 137 additions & 38 deletions dist/js/mui.js
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
/*!
* =====================================================
* Mui v1.1.0 (https://github.com/dcloudio/mui)
* Mui v1.1.1 (https://github.com/dcloudio/mui)
* =====================================================
*/
/**
Expand Down Expand Up @@ -303,7 +303,7 @@ var mui = (function(document, undefined) {
return result;
};

$.regesterHandler = function(type, handler) {
$.registerHandler = function(type, handler) {
var handlers = $[type];
if (!handlers) {
handlers = [];
Expand Down Expand Up @@ -751,7 +751,7 @@ var mui = (function(document, undefined) {
* @returns {$.gestures}
*/
$.registerGesture = function(gesture) {
return $.regesterHandler('gestures', gesture);
return $.registerHandler('gestures', gesture);

};
/**
Expand Down Expand Up @@ -809,18 +809,17 @@ var mui = (function(document, undefined) {
}
});
};
var touch = {};
var detectTouchStart = function(event) {
$.gestures.stoped = false;
var now = Date.now();
var point = event.touches ? event.touches[0] : event;
touch = {
$.gestures.touch = {
target: event.target,
lastTarget: (touch.lastTarget ? touch.lastTarget : null),
lastTarget: ($.gestures.touch && $.gestures.touch.lastTarget ? $.gestures.touch.lastTarget : null),
startTime: now,
touchTime: 0,
flickStartTime: now,
lastTapTime: (touch.lastTapTime ? touch.lastTapTime : 0),
lastTapTime: ($.gestures.touch && $.gestures.touch.lastTapTime ? $.gestures.touch.lastTapTime : 0),
start: {
x: point.pageX,
y: point.pageY
Expand All @@ -841,18 +840,22 @@ var mui = (function(document, undefined) {
lastDeltaY: 0,
angle: '',
direction: '',
lockDirection: false,
startDirection: '',
distance: 0,
drag: false,
swipe: false,
hold: false,
gesture: event
};

detect(event, touch);
detect(event, $.gestures.touch);
};
var detectTouchMove = function(event) {
if ($.gestures.stoped) {
return;
}
var touch = $.gestures.touch;
if (event.target != touch.target) {
return;
}
Expand Down Expand Up @@ -882,6 +885,7 @@ var mui = (function(document, undefined) {
if ($.gestures.stoped) {
return;
}
var touch = $.gestures.touch;
if (event.target != touch.target) {
return;
}
Expand Down Expand Up @@ -1016,20 +1020,19 @@ var mui = (function(document, undefined) {
* @returns {undefined}
*/
(function($, name) {
var last_direction = false;
var handle = function(event, touch) {
switch (event.type) {
case $.EVENT_MOVE:
if (touch.direction) { //drag
//修正direction
//默认锁定单向drag(后续可能需要额外配置支持)
if (!last_direction) {
last_direction = touch.direction;
} else if (last_direction && last_direction !== touch.direction) {
if (last_direction === 'up' || last_direction === 'down') {
touch.direction = touch.deltaY < 0 ? 'up' : 'down';
} else {
touch.direction = touch.deltaX < 0 ? 'left' : 'right';
if (touch.lockDirection && touch.startDirection) {
if (touch.startDirection && touch.startDirection !== touch.direction) {
if (touch.startDirection === 'up' || touch.startDirection === 'down') {
touch.direction = touch.deltaY < 0 ? 'up' : 'down';
} else {
touch.direction = touch.deltaX < 0 ? 'left' : 'right';
}
}
}
if (!touch.drag) {
Expand All @@ -1045,7 +1048,6 @@ var mui = (function(document, undefined) {
if (touch.drag) {
$.trigger(event.target, name + 'end', touch);
}
last_direction = false;
break;
}
};
Expand Down Expand Up @@ -1130,18 +1132,59 @@ var mui = (function(document, undefined) {
}
};
/**
* mui gesture drag
* mui gesture longtap
*/
$.registerGesture({
name : name,
index : 10,
handle : handle,
options : {
holdTimeout : 500,
holdThreshold : 2
name: name,
index: 10,
handle: handle,
options: {
holdTimeout: 500,
holdThreshold: 2
}
});
})(mui, 'longtap');
})(mui, 'longtap');
/**
* mui gesture hold
* @param {type} $
* @param {type} name
* @returns {undefined}
*/
(function($, name) {
var timer;
var handle = function(event, touch) {
var options = this.options;
switch (event.type) {
case $.EVENT_START:
clearTimeout(timer);
timer = setTimeout(function() {
touch.hold = true;
$.trigger(event.target, name, touch);
}, options.holdTimeout);
break;
case $.EVENT_MOVE:
break;
case $.EVENT_END:
case $.EVENT_CANCEL:
clearTimeout(timer);
if (touch.hold) {
$.trigger(event.target, 'release', touch);
}
break;
}
};
/**
* mui gesture hold
*/
$.registerGesture({
name: name,
index: 10,
handle: handle,
options: {
holdTimeout: 0
}
});
})(mui, 'hold');
/**
* mui.init
* @param {type} $
Expand Down Expand Up @@ -1202,7 +1245,7 @@ var mui = (function(document, undefined) {
* @param {function} init
*/
$.registerInit = function(init) {
return $.regesterHandler('inits', init);
return $.registerHandler('inits', init);
};
$(function() {
if ($.os.ios) {
Expand Down Expand Up @@ -1603,6 +1646,18 @@ var mui = (function(document, undefined) {
if ($.os.ios && $.options.statusBarBackground) {
plus.navigator.setStatusBarBackground($.options.statusBarBackground);
}
if($.os.android&&parseFloat($.os.version) < 4.4){
//解决Android平台4.4版本以下，resume后，父窗体标题延迟渲染的问题；
if(plus.webview.currentWebview().parent()==null){
document.addEventListener("resume", function() {
var body = document.body;
body.style.display = 'none';
setTimeout(function() {
body.style.display = '';
}, 10);
});
}
}
});
} else {
if (subpages.length > 0) {
Expand Down Expand Up @@ -1650,7 +1705,7 @@ var mui = (function(document, undefined) {
* @returns {$.gestures}
*/
$.registerBack = function(back) {
return $.regesterHandler('backs', back);
return $.registerHandler('backs', back);
};
/**
* default
Expand All @@ -1670,8 +1725,8 @@ var mui = (function(document, undefined) {
* 后退
*/
$.back = function() {
if (typeof $.options.back === 'function') {
if ($.options.back() === false) {
if (typeof $.options.beforeback === 'function') {
if ($.options.beforeback() === false) {
return;
}
}
Expand All @@ -1687,7 +1742,7 @@ var mui = (function(document, undefined) {
});
window.addEventListener('swiperight', function(e) {
var detail = e.detail;
if ($.options.swipeBack === true && Math.abs(detail.angle)< 3) {
if ($.options.swipeBack === true && Math.abs(detail.angle) < 3) {
$.back();
}
});
Expand Down Expand Up @@ -2680,6 +2735,18 @@ var mui = (function(document, undefined) {
this.reLayout();
$.trigger(this.wrapper, 'beforescrollstart', this);
},
_getDirectionByAngle: function(angle) {
if (angle < -80 && angle > -100) {
return 'up';
} else if (angle >= 80 && angle < 100) {
return 'down';
} else if (angle >= 170 || angle <= -170) {
return 'left';
} else if (angle >= -35 && angle <= 10) {
return 'right';
}
return null;
},
_drag: function(e) {
// if (this.needReset) {
// e.stopPropagation(); //disable parent drag(nested scroller)
Expand All @@ -2698,18 +2765,38 @@ var mui = (function(document, undefined) {
}
}
var isPreventDefault = isReturn = false;
var direction = this._getDirectionByAngle(detail.angle);
if (detail.direction === 'left' || detail.direction === 'right') {
if (this.options.scrollX) {
isPreventDefault = true;
if (!this.moved) { //识别角度
if (direction !== 'left' && direction !== 'right') {
isReturn = true;
} else {
$.gestures.touch.lockDirection = true; //锁定方向
$.gestures.touch.startDirection = detail.direction;
}
}
} else if (this.options.scrollY && !this.moved) {
isReturn = true;
}
} else if (detail.direction === 'up' || detail.direction === 'down') {
if (this.options.scrollY) {
isPreventDefault = true;
// if (!this.moved) { //识别角度,竖向滚动似乎没必要进行小角度验证
// if (direction !== 'up' && direction !== 'down') {
// isReturn = true;
// }
// }
if (!this.moved) {
$.gestures.touch.lockDirection = true; //锁定方向
$.gestures.touch.startDirection = detail.direction;
}
} else if (this.options.scrollX && !this.moved) {
isReturn = true;
}
} else {
isReturn = true;
}
if (isPreventDefault) {
e.stopPropagation(); //阻止冒泡(scroll类嵌套)
Expand All @@ -2723,9 +2810,15 @@ var mui = (function(document, undefined) {
} else {
e.stopPropagation(); //move期间阻止冒泡(scroll嵌套)
}

var deltaX = detail.deltaX - detail.lastDeltaX;
var deltaY = detail.deltaY - detail.lastDeltaY;
var deltaX = 0;
var deltaY = 0;
if (!this.moved) { //start
deltaX = detail.deltaX;
deltaY = detail.deltaY;
} else { //move
deltaX = detail.deltaX - detail.lastDeltaX;
deltaY = detail.deltaY - detail.lastDeltaY;
}
var absDeltaX = Math.abs(detail.deltaX);
var absDeltaY = Math.abs(detail.deltaY);
if (absDeltaX > absDeltaY + this.options.directionLockThreshold) {
Expand Down Expand Up @@ -3588,17 +3681,20 @@ var mui = (function(document, undefined) {
$.trigger(this.wrapper, 'scrollend', this);
},
_flick: function(e) {
if (!this.moved) { //无moved
return;
}
var detail = e.detail;
var direction = detail.direction;
this._clearRequestAnimationFrame();
this.isInTransition = true;
if (direction === 'up' || direction === 'down') {
this.resetPosition(this.options.bounceTime);
return;
}
// if (direction === 'up' || direction === 'down') {
// this.resetPosition(this.options.bounceTime);
// return;
// }
if (e.type === 'flick') {
if (detail.touchTime < 200) { //flick，太容易触发，额外校验一下touchtime
this.x = this._getPage((this.slideNumber + (direction === 'left' ? 1 : -1)), true).x;
this.x = this._getPage((this.slideNumber + (direction === 'right' ? -1 : 1)), true).x;
}
this.resetPosition(this.options.bounceTime);
} else if (e.type === 'dragend' && !detail.flick) {
Expand All @@ -3614,6 +3710,9 @@ var mui = (function(document, undefined) {
//当slider处于隐藏状态时，导致snap计算是错误的，临时先这么判断一下，后续要考虑解决所有scroll在隐藏状态下初始化属性不正确的问题
var currentPage = this.pages[this.loop ? 1 : 0];
currentPage = currentPage || this.pages[0];
if (!currentPage) {
return;
}
this.currentPage = currentPage[0];
this.slideNumber = 0;
} else {
Expand Down
8 changes: 4 additions & 4 deletions dist/js/mui.min.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions examples/hello-mui/css/mui.min.css
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions examples/hello-mui/examples/info.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,6 @@
<meta name="apple-mobile-web-app-status-bar-style" content="black">

<link rel="stylesheet" href="../css/mui.min.css">
<script src="../js/mui.min.js"></script>
<script src="../js/app.js"></script>
<style>
header.mui-bar{
display: none;
Expand Down Expand Up @@ -53,13 +51,15 @@ <h4>新手指南</h4>
</p>
<p>更多详细介绍，请到<a href="http://dcloudio.github.io/mui">mui官网</a>查看；</p>
<h4>版本介绍</h4>
<p>当前版本为1.1.0，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
<p>当前版本为1.1.1，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
<h4>License</h4>
<p>
mui遵循MIT License，源码已提交至Github，<a href="https://github.com/dcloudio/mui">点击查看</a>;
</p>
</div>
</div>
<script src="../js/mui.min.js"></script>
<script src="../js/app.js"></script>
<script type="text/javascript" charset="utf-8">
mui.init();
//处理点击事件，需要打开原生浏览器
Expand Down
Loading

0 comments on commit 003cc9c

Please sign in to comment.