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

MOBILE-3001 core: Fix rebase errors

Browse Source
This commit is contained in:
Dani Palou 2019-05-17 09:17:07 +02:00
parent b9d8d22b79
commit bcc7b4b672
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/addon/mod/forum/providers/prefetch-handler.ts
View File

@ -20,6 +20,7 @@ import { CoreSitesProvider } from '@providers/sites';
import { CoreDomUtilsProvider } from '@providers/utils/dom'; import { CoreDomUtilsProvider } from '@providers/utils/dom';
import { CoreUtilsProvider } from '@providers/utils/utils'; import { CoreUtilsProvider } from '@providers/utils/utils';
import { CoreCourseProvider } from '@core/course/providers/course'; import { CoreCourseProvider } from '@core/course/providers/course';
import { CoreUserProvider } from '@core/user/providers/user';
import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler'; import { CoreCourseActivityPrefetchHandlerBase } from '@core/course/classes/activity-prefetch-handler';
import { CoreGroupsProvider } from '@providers/groups'; import { CoreGroupsProvider } from '@providers/groups';
import { AddonModForumProvider } from './forum'; import { AddonModForumProvider } from './forum';
@ -42,6 +43,7 @@ export class AddonModForumPrefetchHandler extends CoreCourseActivityPrefetchHand
filepoolProvider: CoreFilepoolProvider, filepoolProvider: CoreFilepoolProvider,
sitesProvider: CoreSitesProvider, sitesProvider: CoreSitesProvider,
domUtils: CoreDomUtilsProvider, domUtils: CoreDomUtilsProvider,
private userProvider: CoreUserProvider,
private groupsProvider: CoreGroupsProvider, private groupsProvider: CoreGroupsProvider,
private forumProvider: AddonModForumProvider, private forumProvider: AddonModForumProvider,
private syncProvider: AddonModForumSyncProvider) { private syncProvider: AddonModForumSyncProvider) {

2
src/core/mainmenu/pages/menu/menu.ts
View File

@ -161,7 +161,7 @@ export class CoreMainMenuPage implements OnDestroy {
}); });
this.loaded = this.menuDelegate.areHandlersLoaded(); this.loaded = this.menuDelegate.areHandlersLoaded();
}); }
if (this.urlToOpen) { if (this.urlToOpen) {
// There's a content link to open. // There's a content link to open.