Skip to content

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

解决可拖动式选项卡快速双击切换内容显示异常的bug；

parent 1eb2cc1f
Show whitespace changes
Inline Side-by-side
Showing with 21 additions and 15 deletions
dist/js/mui.js
View file @ 6abfc4cc
...@@ -3053,7 +3053,7 @@ var mui = (function(document, undefined) { ...@@ -3053,7 +3053,7 @@ var mui = (function(document, undefined) {
_start: function(e) { _start: function(e) {
this.moved = this.needReset = false; this.moved = this.needReset = false;
this._transitionTime(); this._transitionTime();
if (this.isInTransition) { if (this.isInTransition && this.moved) {
this.needReset = true; this.needReset = true;
this.isInTransition = false; this.isInTransition = false;
var pos = $.parseTranslateMatrix($.getStyles(this.scroller, 'webkitTransform')); var pos = $.parseTranslateMatrix($.getStyles(this.scroller, 'webkitTransform'));
...@@ -3711,7 +3711,7 @@ var mui = (function(document, undefined) { ...@@ -3711,7 +3711,7 @@ var mui = (function(document, undefined) {
//API //API
resetPosition: function(time) { resetPosition: function(time) {
if (this.pulldown && this.y >= this.options.down.height) { if (this.pulldown && this.y >= this.options.down.height) {
this.pulldownLoading(0, time || 0); this.pulldownLoading(undefined, time || 0);
return true; return true;
} }
return this._super(time); return this._super(time);
...@@ -3884,7 +3884,6 @@ var mui = (function(document, undefined) { ...@@ -3884,7 +3884,6 @@ var mui = (function(document, undefined) {
self.wrapper.addEventListener('scrollend', function() { self.wrapper.addEventListener('scrollend', function() {
self.isInTransition = false; self.isInTransition = false;
var page = self.currentPage; var page = self.currentPage;
var oldSlideNumber = self.slideNumber;
self.slideNumber = self._fixedSlideNumber(); self.slideNumber = self._fixedSlideNumber();
if (self.loop) { if (self.loop) {
if (self.slideNumber === 0) { if (self.slideNumber === 0) {
...@@ -3893,7 +3892,8 @@ var mui = (function(document, undefined) { ...@@ -3893,7 +3892,8 @@ var mui = (function(document, undefined) {
self.setTranslate(self.pages[self.itemLength - 2][0].x, 0); self.setTranslate(self.pages[self.itemLength - 2][0].x, 0);
} }
} }
if (oldSlideNumber != self.slideNumber) { if (self.lastSlideNumber != self.slideNumber) {
self.lastSlideNumber = self.slideNumber;
$.trigger(self.wrapper, 'slide', { $.trigger(self.wrapper, 'slide', {
slideNumber: self.slideNumber slideNumber: self.slideNumber
}); });
...@@ -4063,8 +4063,10 @@ var mui = (function(document, undefined) { ...@@ -4063,8 +4063,10 @@ var mui = (function(document, undefined) {
} }
this.currentPage = currentPage[0]; this.currentPage = currentPage[0];
this.slideNumber = 0; this.slideNumber = 0;
this.lastSlideNumber = typeof this.lastSlideNumber === 'undefined' ? 0 : this.lastSlideNumber;
} else { } else {
this.slideNumber = this._fixedSlideNumber(); this.slideNumber = this._fixedSlideNumber();
this.lastSlideNumber = typeof this.lastSlideNumber === 'undefined' ? this.slideNumber : this.lastSlideNumber;
} }
this.options.startX = this.currentPage.x || 0; this.options.startX = this.currentPage.x || 0;
}, },
......
dist/js/mui.min.js
View file @ 6abfc4cc
This source diff could not be displayed because it is too large. You can view the blob instead.
examples/hello-mui/js/mui.js
View file @ 6abfc4cc
...@@ -3053,7 +3053,7 @@ var mui = (function(document, undefined) { ...@@ -3053,7 +3053,7 @@ var mui = (function(document, undefined) {
_start: function(e) { _start: function(e) {
this.moved = this.needReset = false; this.moved = this.needReset = false;
this._transitionTime(); this._transitionTime();
if (this.isInTransition) { if (this.isInTransition && this.moved) {
this.needReset = true; this.needReset = true;
this.isInTransition = false; this.isInTransition = false;
var pos = $.parseTranslateMatrix($.getStyles(this.scroller, 'webkitTransform')); var pos = $.parseTranslateMatrix($.getStyles(this.scroller, 'webkitTransform'));
...@@ -3711,7 +3711,7 @@ var mui = (function(document, undefined) { ...@@ -3711,7 +3711,7 @@ var mui = (function(document, undefined) {
//API //API
resetPosition: function(time) { resetPosition: function(time) {
if (this.pulldown && this.y >= this.options.down.height) { if (this.pulldown && this.y >= this.options.down.height) {
this.pulldownLoading(0, time || 0); this.pulldownLoading(undefined, time || 0);
return true; return true;
} }
return this._super(time); return this._super(time);
...@@ -3884,7 +3884,6 @@ var mui = (function(document, undefined) { ...@@ -3884,7 +3884,6 @@ var mui = (function(document, undefined) {
self.wrapper.addEventListener('scrollend', function() { self.wrapper.addEventListener('scrollend', function() {
self.isInTransition = false; self.isInTransition = false;
var page = self.currentPage; var page = self.currentPage;
var oldSlideNumber = self.slideNumber;
self.slideNumber = self._fixedSlideNumber(); self.slideNumber = self._fixedSlideNumber();
if (self.loop) { if (self.loop) {
if (self.slideNumber === 0) { if (self.slideNumber === 0) {
...@@ -3893,7 +3892,8 @@ var mui = (function(document, undefined) { ...@@ -3893,7 +3892,8 @@ var mui = (function(document, undefined) {
self.setTranslate(self.pages[self.itemLength - 2][0].x, 0); self.setTranslate(self.pages[self.itemLength - 2][0].x, 0);
} }
} }
if (oldSlideNumber != self.slideNumber) { if (self.lastSlideNumber != self.slideNumber) {
self.lastSlideNumber = self.slideNumber;
$.trigger(self.wrapper, 'slide', { $.trigger(self.wrapper, 'slide', {
slideNumber: self.slideNumber slideNumber: self.slideNumber
}); });
...@@ -4063,8 +4063,10 @@ var mui = (function(document, undefined) { ...@@ -4063,8 +4063,10 @@ var mui = (function(document, undefined) {
} }
this.currentPage = currentPage[0]; this.currentPage = currentPage[0];
this.slideNumber = 0; this.slideNumber = 0;
this.lastSlideNumber = typeof this.lastSlideNumber === 'undefined' ? 0 : this.lastSlideNumber;
} else { } else {
this.slideNumber = this._fixedSlideNumber(); this.slideNumber = this._fixedSlideNumber();
this.lastSlideNumber = typeof this.lastSlideNumber === 'undefined' ? this.slideNumber : this.lastSlideNumber;
} }
this.options.startX = this.currentPage.x || 0; this.options.startX = this.currentPage.x || 0;
}, },
......
examples/hello-mui/js/mui.min.js
View file @ 6abfc4cc
This source diff could not be displayed because it is too large. You can view the blob instead.
js/mui.class.scroll.js
View file @ 6abfc4cc
...@@ -278,7 +278,7 @@ ...@@ -278,7 +278,7 @@
_start: function(e) { _start: function(e) {
this.moved = this.needReset = false; this.moved = this.needReset = false;
this._transitionTime(); this._transitionTime();
if (this.isInTransition) { if (this.isInTransition && this.moved) {
this.needReset = true; this.needReset = true;
this.isInTransition = false; this.isInTransition = false;
var pos = $.parseTranslateMatrix($.getStyles(this.scroller, 'webkitTransform')); var pos = $.parseTranslateMatrix($.getStyles(this.scroller, 'webkitTransform'));
......
js/mui.class.scroll.slider.js
View file @ 6abfc4cc
...@@ -67,7 +67,6 @@ ...@@ -67,7 +67,6 @@
self.wrapper.addEventListener('scrollend', function() { self.wrapper.addEventListener('scrollend', function() {
self.isInTransition = false; self.isInTransition = false;
var page = self.currentPage; var page = self.currentPage;
var oldSlideNumber = self.slideNumber;
self.slideNumber = self._fixedSlideNumber(); self.slideNumber = self._fixedSlideNumber();
if (self.loop) { if (self.loop) {
if (self.slideNumber === 0) { if (self.slideNumber === 0) {
...@@ -76,7 +75,8 @@ ...@@ -76,7 +75,8 @@
self.setTranslate(self.pages[self.itemLength - 2][0].x, 0); self.setTranslate(self.pages[self.itemLength - 2][0].x, 0);
} }
} }
if (oldSlideNumber != self.slideNumber) { if (self.lastSlideNumber != self.slideNumber) {
self.lastSlideNumber = self.slideNumber;
$.trigger(self.wrapper, 'slide', { $.trigger(self.wrapper, 'slide', {
slideNumber: self.slideNumber slideNumber: self.slideNumber
}); });
...@@ -246,8 +246,10 @@ ...@@ -246,8 +246,10 @@
} }
this.currentPage = currentPage[0]; this.currentPage = currentPage[0];
this.slideNumber = 0; this.slideNumber = 0;
this.lastSlideNumber = typeof this.lastSlideNumber === 'undefined' ? 0 : this.lastSlideNumber;
} else { } else {
this.slideNumber = this._fixedSlideNumber(); this.slideNumber = this._fixedSlideNumber();
this.lastSlideNumber = typeof this.lastSlideNumber === 'undefined' ? this.slideNumber : this.lastSlideNumber;
} }
this.options.startX = this.currentPage.x || 0; this.options.startX = this.currentPage.x || 0;
}, },
......
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