Commit e9c3137c authored by hbcui1984's avatar hbcui1984

优化下拉刷新的end方法

parent 511889ec
...@@ -3504,3 +3504,7 @@ select:focus { ...@@ -3504,3 +3504,7 @@ select:focus {
-webkit-transform: translateY(-50%); -webkit-transform: translateY(-50%);
transform: translateY(-50%); transform: translateY(-50%);
} }
.mui-bar-tab ~ .mui-content .mui-slider.mui-fullscreen .mui-segmented-control ~ .mui-slider-group {
bottom: 50px;
}
This source diff could not be displayed because it is too large. You can view the blob instead.
...@@ -3303,7 +3303,7 @@ var mui = (function(document, undefined) { ...@@ -3303,7 +3303,7 @@ var mui = (function(document, undefined) {
}, },
endPulldownToRefresh: function() { endPulldownToRefresh: function() {
var self = this; var self = this;
if (self.topPocket) { if (self.topPocket && self.loading && this.pulldown) {
self.scrollTo(0, 0, self.options.bounceTime, self.options.bounceEasing); self.scrollTo(0, 0, self.options.bounceTime, self.options.bounceEasing);
self.loading = false; self.loading = false;
self._setCaption(self.options.down.contentdown, true); self._setCaption(self.options.down.contentdown, true);
...@@ -3329,7 +3329,7 @@ var mui = (function(document, undefined) { ...@@ -3329,7 +3329,7 @@ var mui = (function(document, undefined) {
}, },
endPullupToRefresh: function(finished) { endPullupToRefresh: function(finished) {
var self = this; var self = this;
if (self.bottomPocket) { if (self.bottomPocket && self.loading && !this.pulldown) {
self.loading = false; self.loading = false;
if (finished) { if (finished) {
self._setCaption(self.options.up.contentnomore); self._setCaption(self.options.up.contentnomore);
...@@ -5577,7 +5577,7 @@ var mui = (function(document, undefined) { ...@@ -5577,7 +5577,7 @@ var mui = (function(document, undefined) {
* 自动消失提示框 * 自动消失提示框
*/ */
$.toast = function(message) { $.toast = function(message) {
if($.os.plus&&$.os.android){ if($.os.plus){
//默认显示在底部; //默认显示在底部;
plus.nativeUI.toast(message,{verticalAlign:'bottom'}); plus.nativeUI.toast(message,{verticalAlign:'bottom'});
}else{ }else{
...@@ -5772,6 +5772,7 @@ var mui = (function(document, undefined) { ...@@ -5772,6 +5772,7 @@ var mui = (function(document, undefined) {
$.trigger(self.element, 'recognized', { $.trigger(self.element, 'recognized', {
value: self.element.value value: self.element.value
}); });
// document.body.classList.remove(CLASS_FOCUSIN);
}, function(e) { }, function(e) {
document.body.classList.remove(CLASS_FOCUSIN); document.body.classList.remove(CLASS_FOCUSIN);
}); });
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
This source diff could not be displayed because it is too large. You can view the blob instead.
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