Skip to content

M
mui
Commit f78aaa8a authored by hbcui1984's avatar hbcui1984
Browse files
Options

编译到mui v2.2.0

parent 2dfbe62b
Show whitespace changes
Inline Side-by-side
Showing with 241 additions and 105 deletions
dist/css/mui.css
View file @ f78aaa8a
/*!
* =====================================================
* Mui v2.1.0 (https://github.com/dcloudio/mui)
* Mui v2.2.0 (https://github.com/dcloudio/mui)
* =====================================================
*/
......@@ -2395,14 +2395,22 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
margin-top: 15px;
}
.mui-table-view-cell.mui-collapse .mui-table-view:after
.mui-table-view-cell.mui-collapse .mui-table-view:before, .mui-table-view-cell.mui-collapse .mui-table-view:after
{
left: 15px;
height: 0;
}
.mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell:last-child:after
{
height: 0;
}
.mui-table-view-cell.mui-collapse > .mui-navigate-right:after, .mui-table-view-cell.mui-collapse > .mui-push-right:after
{
content: '\e581';
}
.mui-table-view-cell.mui-collapse.mui-active
{
margin-top: -1px;
}
.mui-table-view-cell.mui-collapse.mui-active .mui-table-view, .mui-table-view-cell.mui-collapse.mui-active .mui-collapse-content
{
display: block;
......@@ -2425,7 +2433,6 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
-o-transition: height .35s ease;
transition: height .35s ease;
border: 1px solid #ddd;
background: white;
}
.mui-table-view-cell.mui-collapse .mui-collapse-content > .mui-input-group, .mui-table-view-cell.mui-collapse .mui-collapse-content > .mui-slider
......
dist/css/mui.min.css
View file @ f78aaa8a
This source diff could not be displayed because it is too large. You can view the blob instead.
dist/js/mui.js
View file @ f78aaa8a
/*!
* =====================================================
* Mui v2.1.0 (https://github.com/dcloudio/mui)
* Mui v2.2.0 (https://github.com/dcloudio/mui)
* =====================================================
*/
/**
......@@ -918,6 +918,22 @@ var mui = (function(document, undefined) {
}, true);
};
};
var findDelegateFn = function(element, event) {
var delegateCallbacks = delegateFns[mid(element)];
var result = false;
if (delegateCallbacks) {
result = [];
if (event) {
var filterFn = function(fn) {
return fn.type === event;
}
return delegateCallbacks.filter(filterFn);
} else {
result = delegateCallbacks;
}
}
return result;
};
var preventDefaultException = /^(INPUT|TEXTAREA|BUTTON|SELECT)$/;
/**
* mui delegate events
......@@ -940,8 +956,16 @@ var mui = (function(document, undefined) {
var delegateCallbacks = delegateCallbackObjs[selector] || (delegateCallbackObjs[selector] = []);
delegateCallbacks.push(callback);
if (isAddEventListener) {
delegateFns[mid(element)] = delegateFn(element, event, selector, callback);
element.addEventListener(event, delegateFns[mid(element)]);
var delegateFnArray = delegateFns[mid(element)];
if (!delegateFnArray) {
delegateFnArray = [];
}
var delegateCallback = delegateFn(element, event, selector, callback);
delegateFnArray.push(delegateCallback);
delegateCallback.i = delegateFnArray.length - 1;
delegateCallback.type = event;
delegateFns[mid(element)] = delegateFnArray;
element.addEventListener(event, delegateCallback);
if (event === 'tap') { //TODO 需要找个更好的解决方案
element.addEventListener('click', function(e) {
if (e.target) {
......@@ -965,11 +989,13 @@ var mui = (function(document, undefined) {
$.fn.off = function(event, selector, callback) {
return this.each(function() {
var _mid = mid(this);
if (!callback) {
if (delegates[_mid] && delegates[_mid][event]) {
delete delegates[_mid][event][selector];
}
} else {
if (!event) { //mui(selector).off();
delegates[_mid] && delete delegates[_mid];
} else if (!selector) { //mui(selector).off(event);
delegates[_mid] && delete delegates[_mid][event];
} else if (!callback) { //mui(selector).off(event,selector);
delegates[_mid] && delegates[_mid][event] && delete delegates[_mid][event][selector];
} else { //mui(selector).off(event,selector,callback);
var delegateCallbacks = delegates[_mid] && delegates[_mid][event] && delegates[_mid][event][selector];
$.each(delegateCallbacks, function(index, delegateCallback) {
if (mid(delegateCallback) === mid(callback)) {
......@@ -978,12 +1004,23 @@ var mui = (function(document, undefined) {
}
}, true);
}
if (delegates[_mid]) {
//如果off掉了所有当前element的指定的event事件，则remove掉当前element的delegate回调
if (delegates[_mid] && $.isEmptyObject(delegates[_mid][event])) {
this.removeEventListener(event, delegateFns[_mid]);
delete delegateFns[_mid];
if ((!delegates[_mid][event] || $.isEmptyObject(delegates[_mid][event]))) {
findDelegateFn(this, event).forEach(function(fn) {
this.removeEventListener(fn.type, fn);
delete delegateFns[_mid][fn.i];
}.bind(this));
}
})
} else {
//如果delegates[_mid]已不存在，删除所有
findDelegateFn(this).forEach(function(fn) {
this.removeEventListener(fn.type, fn);
delete delegateFns[_mid][fn.i];
}.bind(this));
}
});
};
})(mui);
/**
......@@ -4073,7 +4110,7 @@ var mui = (function(document, undefined) {
this.pulldownLoading(undefined, time || 0);
return true;
} else {
this.topPocket.classList.remove(CLASS_VISIBILITY);
!this.loading && this.topPocket.classList.remove(CLASS_VISIBILITY);
}
}
return this._super(time);
......@@ -4123,7 +4160,7 @@ var mui = (function(document, undefined) {
},
endPullupToRefresh: function(finished) {
var self = this;
if (self.bottomPocket && self.loading && !this.pulldown) {
if (self.bottomPocket) { // && self.loading && !this.pulldown
self.loading = false;
if (finished) {
this.finished = true;
......@@ -4133,9 +4170,9 @@ var mui = (function(document, undefined) {
self.wrapper.removeEventListener('scrollbottom', self);
} else {
self._setCaption(self.options.up.contentdown);
setTimeout(function() {
// setTimeout(function() {
self.loading || self.bottomPocket.classList.remove(CLASS_VISIBILITY);
}, 350);
// }, 300);
}
}
},
......
dist/js/mui.min.js
View file @ f78aaa8a
This source diff could not be displayed because it is too large. You can view the blob instead.
examples/hello-mui/css/mui.css
View file @ f78aaa8a
/*!
* =====================================================
* Mui v2.1.0 (https://github.com/dcloudio/mui)
* Mui v2.2.0 (https://github.com/dcloudio/mui)
* =====================================================
*/
......@@ -2395,14 +2395,22 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
margin-top: 15px;
}
.mui-table-view-cell.mui-collapse .mui-table-view:after
.mui-table-view-cell.mui-collapse .mui-table-view:before, .mui-table-view-cell.mui-collapse .mui-table-view:after
{
left: 15px;
height: 0;
}
.mui-table-view-cell.mui-collapse .mui-table-view .mui-table-view-cell:last-child:after
{
height: 0;
}
.mui-table-view-cell.mui-collapse > .mui-navigate-right:after, .mui-table-view-cell.mui-collapse > .mui-push-right:after
{
content: '\e581';
}
.mui-table-view-cell.mui-collapse.mui-active
{
margin-top: -1px;
}
.mui-table-view-cell.mui-collapse.mui-active .mui-table-view, .mui-table-view-cell.mui-collapse.mui-active .mui-collapse-content
{
display: block;
......@@ -2425,7 +2433,6 @@ input[type='submit']:enabled:active, input[type='submit'].mui-active:enabled,
-o-transition: height .35s ease;
transition: height .35s ease;
border: 1px solid #ddd;
background: white;
}
.mui-table-view-cell.mui-collapse .mui-collapse-content > .mui-input-group, .mui-table-view-cell.mui-collapse .mui-collapse-content > .mui-slider
......
examples/hello-mui/css/mui.min.css
View file @ f78aaa8a
This source diff could not be displayed because it is too large. You can view the blob instead.
examples/hello-mui/examples/grid-pagination.html
View file @ f78aaa8a
......@@ -11,7 +11,7 @@
<!--标准mui.css-->
<link rel="stylesheet" href="../css/mui.min.css">
<!--App自定义的css-->
<link rel="stylesheet" type="text/css" href="../css/app.css"/>
<link rel="stylesheet" type="text/css" href="../css/app.css" />
<style>
.mui-slider-indicator {
bottom: 0;
......@@ -21,6 +21,7 @@
}
</style>
</head>
<body>
<header class="mui-bar mui-bar-nav">
<a class="mui-action-back mui-icon mui-icon-left-nav mui-pull-left"></a>
......@@ -234,22 +235,26 @@
//克隆最后一个节点
var last = items[items.length - 1].cloneNode(true);
last.classList.add('mui-slider-item-duplicate');
//处理是否循环逻辑，若支持循环，需支持两点：
//1、在.mui-slider-group节点上增加.mui-slider-loop类
//2、重复增加2个循环节点，图片顺序变为：N、1、2...N、1
var sliderApi = mui(slider).slider();
function toggleLoop(loop) {
if (loop) {
group.classList.add('mui-slider-loop');
group.insertBefore(last, group.firstChild);
group.appendChild(first);
sliderApi.refresh();
sliderApi.gotoItem(0);
} else {
group.classList.remove('mui-slider-loop');
group.removeChild(first);
group.removeChild(last);
sliderApi.refresh();
sliderApi.gotoItem(0);
}
}
//按下“循环”按钮的处理逻辑；
document.getElementById('Gallery_Toggle').addEventListener('toggle', function(e) {
var loop = e.detail.isActive;
......@@ -257,4 +262,5 @@
});
});
</script>
</html>
\ No newline at end of file
examples/hello-mui/examples/imageviewer.html
View file @ f78aaa8a
......@@ -10,7 +10,7 @@
<link rel="stylesheet" href="../css/mui.min.css">
<!--App自定义的css-->
<style type="text/css">
.mui-fullscreen {
.mui-preview-image.mui-fullscreen {
position: fixed;
z-index: 20;
background-color: #000;
......
examples/hello-mui/examples/info.html
View file @ f78aaa8a
......@@ -48,7 +48,7 @@
</p>
<p>更多详细介绍，请到<a href="http://dcloudio.github.io/mui">mui官网</a>查看；</p>
<h4>版本介绍</h4>
<p>当前版本为2.1.0，可到<a href="https://github.com/dcloudio/mui">Github</a>上获取最新版本。</p>
<p>当前版本为2.2.0，可到<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>;
......
examples/hello-mui/examples/setting.html
View file @ f78aaa8a
......@@ -215,7 +215,7 @@
</ul>
<ul class="mui-table-view mui-table-view-chevron">
<li class="mui-table-view-cell">
<a href="#about" class="mui-navigate-right">关于MUI <i class="mui-pull-right update">V2.1.0</i></a>
<a href="#about" class="mui-navigate-right">关于MUI <i class="mui-pull-right update">V2.2.0</i></a>
</li>
</ul>
<ul class="mui-table-view">
......
examples/hello-mui/js/mui.js
View file @ f78aaa8a
/*!
* =====================================================
* Mui v2.1.0 (https://github.com/dcloudio/mui)
* Mui v2.2.0 (https://github.com/dcloudio/mui)
* =====================================================
*/
/**
......@@ -918,6 +918,22 @@ var mui = (function(document, undefined) {
}, true);
};
};
var findDelegateFn = function(element, event) {
var delegateCallbacks = delegateFns[mid(element)];
var result = false;
if (delegateCallbacks) {
result = [];
if (event) {
var filterFn = function(fn) {
return fn.type === event;
}
return delegateCallbacks.filter(filterFn);
} else {
result = delegateCallbacks;
}
}
return result;
};
var preventDefaultException = /^(INPUT|TEXTAREA|BUTTON|SELECT)$/;
/**
* mui delegate events
......@@ -940,8 +956,16 @@ var mui = (function(document, undefined) {
var delegateCallbacks = delegateCallbackObjs[selector] || (delegateCallbackObjs[selector] = []);
delegateCallbacks.push(callback);
if (isAddEventListener) {
delegateFns[mid(element)] = delegateFn(element, event, selector, callback);
element.addEventListener(event, delegateFns[mid(element)]);
var delegateFnArray = delegateFns[mid(element)];
if (!delegateFnArray) {
delegateFnArray = [];
}
var delegateCallback = delegateFn(element, event, selector, callback);
delegateFnArray.push(delegateCallback);
delegateCallback.i = delegateFnArray.length - 1;
delegateCallback.type = event;
delegateFns[mid(element)] = delegateFnArray;
element.addEventListener(event, delegateCallback);
if (event === 'tap') { //TODO 需要找个更好的解决方案
element.addEventListener('click', function(e) {
if (e.target) {
......@@ -965,11 +989,13 @@ var mui = (function(document, undefined) {
$.fn.off = function(event, selector, callback) {
return this.each(function() {
var _mid = mid(this);
if (!callback) {
if (delegates[_mid] && delegates[_mid][event]) {
delete delegates[_mid][event][selector];
}
} else {
if (!event) { //mui(selector).off();
delegates[_mid] && delete delegates[_mid];
} else if (!selector) { //mui(selector).off(event);
delegates[_mid] && delete delegates[_mid][event];
} else if (!callback) { //mui(selector).off(event,selector);
delegates[_mid] && delegates[_mid][event] && delete delegates[_mid][event][selector];
} else { //mui(selector).off(event,selector,callback);
var delegateCallbacks = delegates[_mid] && delegates[_mid][event] && delegates[_mid][event][selector];
$.each(delegateCallbacks, function(index, delegateCallback) {
if (mid(delegateCallback) === mid(callback)) {
......@@ -978,12 +1004,23 @@ var mui = (function(document, undefined) {
}
}, true);
}
if (delegates[_mid]) {
//如果off掉了所有当前element的指定的event事件，则remove掉当前element的delegate回调
if (delegates[_mid] && $.isEmptyObject(delegates[_mid][event])) {
this.removeEventListener(event, delegateFns[_mid]);
delete delegateFns[_mid];
if ((!delegates[_mid][event] || $.isEmptyObject(delegates[_mid][event]))) {
findDelegateFn(this, event).forEach(function(fn) {
this.removeEventListener(fn.type, fn);
delete delegateFns[_mid][fn.i];
}.bind(this));
}
})
} else {
//如果delegates[_mid]已不存在，删除所有
findDelegateFn(this).forEach(function(fn) {
this.removeEventListener(fn.type, fn);
delete delegateFns[_mid][fn.i];
}.bind(this));
}
});
};
})(mui);
/**
......@@ -4073,7 +4110,7 @@ var mui = (function(document, undefined) {
this.pulldownLoading(undefined, time || 0);
return true;
} else {
this.topPocket.classList.remove(CLASS_VISIBILITY);
!this.loading && this.topPocket.classList.remove(CLASS_VISIBILITY);
}
}
return this._super(time);
......@@ -4123,7 +4160,7 @@ var mui = (function(document, undefined) {
},
endPullupToRefresh: function(finished) {
var self = this;
if (self.bottomPocket && self.loading && !this.pulldown) {
if (self.bottomPocket) { // && self.loading && !this.pulldown
self.loading = false;
if (finished) {
this.finished = true;
......@@ -4133,9 +4170,9 @@ var mui = (function(document, undefined) {
self.wrapper.removeEventListener('scrollbottom', self);
} else {
self._setCaption(self.options.up.contentdown);
setTimeout(function() {
// setTimeout(function() {
self.loading || self.bottomPocket.classList.remove(CLASS_VISIBILITY);
}, 350);
// }, 300);
}
}
},
......
examples/hello-mui/js/mui.min.js
View file @ f78aaa8a
This source diff could not be displayed because it is too large. You can view the blob instead.
examples/login/css/mui.min.css
View file @ f78aaa8a
This source diff could not be displayed because it is too large. You can view the blob instead.
examples/login/js/mui.min.js
View file @ f78aaa8a
This source diff could not be displayed because it is too large. You can view the blob instead.
js/mui.class.scroll.pullrefresh.js
View file @ f78aaa8a
......@@ -47,7 +47,7 @@
this.pulldownLoading(undefined, time || 0);
return true;
} else {
this.topPocket.classList.remove(CLASS_VISIBILITY);
!this.loading && this.topPocket.classList.remove(CLASS_VISIBILITY);
}
}
return this._super(time);
......@@ -97,7 +97,7 @@
},
endPullupToRefresh: function(finished) {
var self = this;
if (self.bottomPocket && self.loading && !this.pulldown) {
if (self.bottomPocket) { // && self.loading && !this.pulldown
self.loading = false;
if (finished) {
this.finished = true;
......@@ -107,9 +107,9 @@
self.wrapper.removeEventListener('scrollbottom', self);
} else {
self._setCaption(self.options.up.contentdown);
setTimeout(function() {
// setTimeout(function() {
self.loading || self.bottomPocket.classList.remove(CLASS_VISIBILITY);
}, 350);
// }, 300);
}
}
},
......
js/mui.event.js
View file @ f78aaa8a
......@@ -99,6 +99,22 @@
}, true);
};
};
var findDelegateFn = function(element, event) {
var delegateCallbacks = delegateFns[mid(element)];
var result = false;
if (delegateCallbacks) {
result = [];
if (event) {
var filterFn = function(fn) {
return fn.type === event;
}
return delegateCallbacks.filter(filterFn);
} else {
result = delegateCallbacks;
}
}
return result;
};
var preventDefaultException = /^(INPUT|TEXTAREA|BUTTON|SELECT)$/;
/**
* mui delegate events
......@@ -121,8 +137,16 @@
var delegateCallbacks = delegateCallbackObjs[selector] || (delegateCallbackObjs[selector] = []);
delegateCallbacks.push(callback);
if (isAddEventListener) {
delegateFns[mid(element)] = delegateFn(element, event, selector, callback);
element.addEventListener(event, delegateFns[mid(element)]);
var delegateFnArray = delegateFns[mid(element)];
if (!delegateFnArray) {
delegateFnArray = [];
}
var delegateCallback = delegateFn(element, event, selector, callback);
delegateFnArray.push(delegateCallback);
delegateCallback.i = delegateFnArray.length - 1;
delegateCallback.type = event;
delegateFns[mid(element)] = delegateFnArray;
element.addEventListener(event, delegateCallback);
if (event === 'tap') { //TODO 需要找个更好的解决方案
element.addEventListener('click', function(e) {
if (e.target) {
......@@ -146,11 +170,13 @@
$.fn.off = function(event, selector, callback) {
return this.each(function() {
var _mid = mid(this);
if (!callback) {
if (delegates[_mid] && delegates[_mid][event]) {
delete delegates[_mid][event][selector];
}
} else {
if (!event) { //mui(selector).off();
delegates[_mid] && delete delegates[_mid];
} else if (!selector) { //mui(selector).off(event);
delegates[_mid] && delete delegates[_mid][event];
} else if (!callback) { //mui(selector).off(event,selector);
delegates[_mid] && delegates[_mid][event] && delete delegates[_mid][event][selector];
} else { //mui(selector).off(event,selector,callback);
var delegateCallbacks = delegates[_mid] && delegates[_mid][event] && delegates[_mid][event][selector];
$.each(delegateCallbacks, function(index, delegateCallback) {
if (mid(delegateCallback) === mid(callback)) {
......@@ -159,11 +185,22 @@
}
}, true);
}
if (delegates[_mid]) {
//如果off掉了所有当前element的指定的event事件，则remove掉当前element的delegate回调
if (delegates[_mid] && $.isEmptyObject(delegates[_mid][event])) {
this.removeEventListener(event, delegateFns[_mid]);
delete delegateFns[_mid];
if ((!delegates[_mid][event] || $.isEmptyObject(delegates[_mid][event]))) {
findDelegateFn(this, event).forEach(function(fn) {
this.removeEventListener(fn.type, fn);
delete delegateFns[_mid][fn.i];
}.bind(this));
}
} else {
//如果delegates[_mid]已不存在，删除所有
findDelegateFn(this).forEach(function(fn) {
this.removeEventListener(fn.type, fn);
delete delegateFns[_mid][fn.i];
}.bind(this));
}
})
});
};
})(mui);
\ No newline at end of file
package.json
View file @ f78aaa8a
{
"name": "mui",
"description": "Build mobile apps with simple HTML, CSS, and JS components.",
"version": "2.1.0",
"version": "2.2.0",
"keywords": [
"css",
"fonts",
......
sass/table-views.scss
View file @ f78aaa8a
......@@ -353,8 +353,13 @@
//collapse
.#{$namespace}table-view-cell.#{$namespace}collapse{
.#{$namespace}table-view:after{
left:15px;
.#{$namespace}table-view{
&:before,&:after{
height:0;
}
.#{$namespace}table-view-cell:last-child:after{
height:0;
}
}
//二级列表默认为向下箭头；
>.#{$namespace}navigate-right:after, >.#{$namespace}push-right:after {
......@@ -362,7 +367,7 @@
}
&.#{$namespace}active{
margin-top: -1px;
.#{$namespace}table-view,.#{$namespace}collapse-content{
display: block;
}
......@@ -376,7 +381,7 @@
padding: 8px 15px;
margin: 11px -15px -11px;
background: white;
border: 1px solid #ddd;
// border: 1px solid #ddd;
position: relative;
overflow: hidden;
-webkit-transition: height .35s ease;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment