javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 03:32:21 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(cache): do not cache 0 value dimensions

Browse Source
This commit is contained in:
Adam Bradley
2015-11-05 16:18:51 -06:00
parent 982f32bbcb
commit 35307b36f4
1 changed files with 23 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ionic/util/dom.ts
View File

@ -245,12 +245,19 @@ export function getDimensions(ion) {
let dimensions = dimensionCache[ion._dimId]; let dimensions = dimensionCache[ion._dimId];
if (!dimensions) { if (!dimensions) {
let ele = ion.getNativeElement(); let ele = ion.getNativeElement();
// make sure we got good values before caching
if (ele.offsetWidth && ele.offsetHeight) {
dimensions = dimensionCache[ion._dimId] = { dimensions = dimensionCache[ion._dimId] = {
width: ele.offsetWidth, width: ele.offsetWidth,
height: ele.offsetHeight, height: ele.offsetHeight,
left: ele.offsetLeft, left: ele.offsetLeft,
top: ele.offsetTop top: ele.offsetTop
}; };
} else {
// do not cache bad values
return { width: 0, height: 0, left: 0, top: 0 };
}
} }
return dimensions; return dimensions;
@ -258,10 +265,16 @@ export function getDimensions(ion) {
export function windowDimensions() { export function windowDimensions() {
if (!dimensionCache.win) { if (!dimensionCache.win) {
// make sure we got good values before caching
if (window.innerWidth && window.innerHeight) {
dimensionCache.win = { dimensionCache.win = {
width: window.innerWidth, width: window.innerWidth,
height: window.innerHeight height: window.innerHeight
}; };
} else {
// do not cache bad values
return { width: 0, height: 0 };
}
} }
return dimensionCache.win; return dimensionCache.win;
} }