Commit 825b6b95 authored by hbcui1984's avatar hbcui1984

图片动态更换后支持预览

parent f16b549b
...@@ -117,10 +117,10 @@ ...@@ -117,10 +117,10 @@
if (!this.groups[group]) { if (!this.groups[group]) {
this.groups[group] = []; this.groups[group] = [];
} }
if (img.__mui_img_data) { var src = img.getAttribute('src');
if (img.__mui_img_data && img.__mui_img_data.src === src) { //已缓存且图片未变化
this.groups[group].push(img.__mui_img_data); this.groups[group].push(img.__mui_img_data);
} else { } else {
var src = img.getAttribute('src');
var lazyload = img.getAttribute('data-preview-src'); var lazyload = img.getAttribute('data-preview-src');
if (!lazyload) { if (!lazyload) {
lazyload = src; lazyload = src;
......
...@@ -188,6 +188,7 @@ ...@@ -188,6 +188,7 @@
e.detail.gesture.preventDefault(); e.detail.gesture.preventDefault();
var deltaY = detail.deltaY - this.startDeltaY; var deltaY = detail.deltaY - this.startDeltaY;
deltaY = Math.min(deltaY, 1.5 * this.options.down.height); deltaY = Math.min(deltaY, 1.5 * this.options.down.height);
this.deltaY = deltaY;
this._pulling(deltaY); this._pulling(deltaY);
var state = deltaY > this.options.down.height ? STATE_AFTERCHANGEOFFSET : STATE_BEFORECHANGEOFFSET; var state = deltaY > this.options.down.height ? STATE_AFTERCHANGEOFFSET : STATE_BEFORECHANGEOFFSET;
if (this.state !== state) { if (this.state !== state) {
...@@ -201,6 +202,13 @@ ...@@ -201,6 +202,13 @@
} }
this['_' + state](deltaY); this['_' + state](deltaY);
} }
if ($.os.ios && parseFloat($.os.version) >= 8) {
var clientY = detail.gesture.touches[0].clientY;
if ((clientY + 10) > window.innerHeight || clientY < 10) {
this._dragend(e);
return;
}
}
} }
}, },
_dragend: function(e) { _dragend: function(e) {
...@@ -313,7 +321,11 @@ ...@@ -313,7 +321,11 @@
this.pullUpTips && this.pullUpTips.classList.remove(CLASS_HIDDEN); this.pullUpTips && this.pullUpTips.classList.remove(CLASS_HIDDEN);
this.pullDownTips.classList.add(CLASS_TRANSITIONING); this.pullDownTips.classList.add(CLASS_TRANSITIONING);
this.pullDownTips.style.webkitTransform = 'translate3d(0,0,0)'; this.pullDownTips.style.webkitTransform = 'translate3d(0,0,0)';
if (this.deltaY <= 0) {
this.removePullDownTips();
} else {
this.removing = true; this.removing = true;
}
}, },
endPullUpToRefresh: function(finished) { endPullUpToRefresh: function(finished) {
if (finished) { if (finished) {
......
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