javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into list-border-refactor

Browse Source 
Conflicts:
	ionic/util/dom.ts
This commit is contained in:
Brandy Carney
2015-11-05 19:16:24 -05:00
parent 53164b41ca 0a06357de6
commit 697e92ebcb
10 changed files with 72 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
ionic/util/dom.ts
View File

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