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

Merge branch '2.0' into layout-refactor

Browse Source 
# Conflicts:
#	src/components/tabs/test/advanced/index.ts
This commit is contained in:
Adam Bradley
2016-06-21 11:37:47 -05:00
parent f20c7e42a2 2bff535e7b
commit 060d064325
32 changed files with 876 additions and 297 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/content/content.ts
View File

@ -185,6 +185,13 @@ export class Content extends Ion {
}
};
}
/**
* @private
*/
getScrollElement(): HTMLElement {
return this._scrollEle;
}
/**
* @private