CIT/Vmeda.Online
3
0
Fork 1
forked from EVOgeek/Vmeda.Online
Code Pull Requests Activity

MOBILE-2873 blog: Show blog icon on the tab bar if needed

Browse Source
This commit is contained in:
Pau Ferrer Ocaña 2019-03-08 10:24:08 +01:00
parent 910ee50600
commit 2469d903a7
2 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/core/course/providers/sync.ts
View File

@ -49,19 +49,21 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
* Try to synchronize all the courses in a certain site or in all sites.
*
* @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
* @param {boolean} [force] Wether the execution is forced (manual sync).
* @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
*/
syncAllCourses(siteId?: string): Promise<any> {
return this.syncOnSites('courses', this.syncAllCoursesFunc.bind(this), undefined, siteId);
syncAllCourses(siteId?: string, force?: boolean): Promise<any> {
return this.syncOnSites('courses', this.syncAllCoursesFunc.bind(this), [force], siteId);
}
/**
* Sync all courses on a site.
*
* @param {string} [siteId] Site ID to sync. If not defined, sync all sites.
* @param {string} siteId Site ID to sync. If not defined, sync all sites.
* @param {boolean} force Wether the execution is forced (manual sync).
* @return {Promise<any>} Promise resolved if sync is successful, rejected if sync fails.
*/
protected syncAllCoursesFunc(siteId?: string): Promise<any> {
protected syncAllCoursesFunc(siteId: string, force: boolean): Promise<any> {
const p1 = [];
p1.push(this.logHelper.syncSite(siteId));
@ -69,7 +71,10 @@ export class CoreCourseSyncProvider extends CoreSyncBaseProvider {
p1.push(this.courseOffline.getAllManualCompletions(siteId).then((completions) => {
// Sync all courses.
const p2 = completions.map((completion) => {
return this.syncCourseIfNeeded(completion.courseid, siteId).then((result) => {
const promise = force ? this.syncCourse(completion.courseid, siteId) :
this.syncCourseIfNeeded(completion.courseid, siteId);
return promise.then((result) => {
if (result && result.updated) {
// Sync successful, send event.
this.eventsProvider.trigger(CoreCourseSyncProvider.AUTO_SYNCED, {

16
src/core/mainmenu/pages/menu/menu.scss
View File

@ -17,4 +17,20 @@ ion-app.app-root page-core-mainmenu {
font-size: 23px;
height: 23px;
}
.ion-md-fa-newspaper-o,
.ion-ios-fa-newspaper-o,
.ion-ios-fa-newspaper-o-outline,
.ion-wp-fa-newspaper-o,
.ion-fa-newspaper-o {
@extend .fa-newspaper-o;
@extend .fa;
font-size: 22px;
height: 22px;
}
.ion-ios-fa-newspaper-o-outline {
font-size: 23px;
height: 23px;
}
}