EVOgeek
/
Vmeda.Online
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2314 from crazyserver/MOBILE-3269 

Mobile 3269
main
Juan Leyva 2020-03-12 12:14:34 +01:00 committed by GitHub
parent f37280a12a a237a03753
commit 40ebb62a62
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/settings/providers/helper.ts
View File

@ -172,7 +172,7 @@ export class CoreSettingsHelper {
let totalEntries = 0;
await Promise.all(clearTables.map(async (name) =>
totalEntries += await site.getDb().countRecords(name)
totalEntries = await site.getDb().countRecords(name) + totalEntries
));
return totalEntries;

5
src/providers/utils/dom.ts
View File

@ -1056,13 +1056,14 @@ export class CoreDomUtilsProvider {
/**
* Returns scrollTop of the content.
* Checks hidden property _scroll to avoid errors if view is not active.
* Checks hidden property _scrollContent to avoid errors if view is not active.
* Using navite value of scroll to avoid having non updated values.
*
* @param content Content where to execute the function.
* @return Content scrollTop or 0.
*/
getScrollTop(content: Content): number {
return (content && content._scroll && content.scrollTop) || 0;
return (content && content._scrollContent && content._scrollContent.nativeElement.scrollTop) || 0;
}
/**