github
/
element
mirror of https://github.com/ElemeFE/element
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #842 from baiyaaaaa/master 

fix ie bounding top bug
pull/846/head
杨奕 2016-11-05 13:55:52 +08:00 committed by GitHub
parent 07cd230674 cd16a0b20d
commit 56126c9a8f
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/cooking.demo.js
View File

@ -91,5 +91,5 @@ if (process.env.NODE_ENV === 'production') {
cooking.add('vue.preserveWhitespace', false); cooking.add('vue.preserveWhitespace', false);
cooking.add('output.chunkFilename', 'element.[id].[chunkhash:7].js'); cooking.add('output.chunkFilename', 'element.[id].[chunkhash:7].js');
cooking.add('output.filename', 'element.[name].[chunkhash:7].js'); cooking.add('output.filename', 'element.[name].[hash:7].js');
module.exports = cooking.resolve(); module.exports = cooking.resolve();

13
src/utils/popper.js
View File

@ -1148,13 +1148,22 @@
*/ */
function getBoundingClientRect(element) { function getBoundingClientRect(element) {
var rect = element.getBoundingClientRect(); var rect = element.getBoundingClientRect();
// whether the IE version is lower than 11
var isIE = navigator.userAgent.indexOf("MSIE") != -1;
// fix ie document bouding top always 0 bug
var rectTop = isIE && element.tagName === 'HTML'
? -element.scrollTop
: rect.top;
return { return {
left: rect.left, left: rect.left,
top: rect.top, top: rectTop,
right: rect.right, right: rect.right,
bottom: rect.bottom, bottom: rect.bottom,
width: rect.right - rect.left, width: rect.right - rect.left,
height: rect.bottom - rect.top height: rect.bottom - rectTop
}; };
} }