Browse Source

Merge pull request #613 in VISUAL/fineui from ~FAY/fineui:master to master

* commit 'a33b087b3b569c289fd4194615708167fb546aca':
  恢复scale
es6
fay 6 years ago
parent
commit
4bd35f7807
  1. 44
      src/core/jquery.js

44
src/core/jquery.js vendored

@ -9390,30 +9390,30 @@ jQuery.fn.offset = function( options ) {
// If we don't have gBCR, just use 0,0 rather than error // If we don't have gBCR, just use 0,0 rather than error
// BlackBerry 5, iOS 3 (original iPhone) // BlackBerry 5, iOS 3 (original iPhone)
// if ( typeof elem.getBoundingClientRect !== core_strundefined ) { if ( typeof elem.getBoundingClientRect !== core_strundefined ) {
// box = elem.getBoundingClientRect(); box = elem.getBoundingClientRect();
// } }
// 解决transform下的offset问题 // 解决transform下的offset问题(先恢复)
var el = elem, // var el = elem,
offsetLeft = 0, // offsetLeft = 0,
offsetTop = 0; // offsetTop = 0;
do{ // do{
offsetLeft += el.offsetLeft; // offsetLeft += el.offsetLeft;
offsetTop += el.offsetTop; // offsetTop += el.offsetTop;
el = el.offsetParent; // el = el.offsetParent;
} while( el ); // } while( el );
var elm = elem; // var elm = elem;
do{ // do{
offsetLeft -= elm.scrollLeft || 0; // offsetLeft -= elm.scrollLeft || 0;
offsetTop -= elm.scrollTop || 0; // offsetTop -= elm.scrollTop || 0;
elm = elm.parentNode; // elm = elm.parentNode;
} while( elm ); // } while( elm );
win = getWindow( doc ); win = getWindow( doc );
return { return {
top: offsetTop + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ), top: box.top + ( win.pageYOffset || docElem.scrollTop ) - ( docElem.clientTop || 0 ),
left: offsetLeft + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 ) left: box.left + ( win.pageXOffset || docElem.scrollLeft ) - ( docElem.clientLeft || 0 )
}; };
}; };

Loading…
Cancel
Save