MOBILE-3565 core: Move handlers to services folder

main
Pau Ferrer Ocaña 2020-11-12 13:46:57 +01:00
parent 67eb694737
commit 58d901f207
5 changed files with 26 additions and 10 deletions

View File

@ -15,7 +15,7 @@
import { NgModule } from '@angular/core';
import { RouterModule, Routes } from '@angular/router';
import { CoreHomeDelegate } from '../mainmenu/services/home.delegate';
import { CoreCoursesDashboardHandler } from './handlers/dashboard';
import { CoreCoursesDashboardHandler } from './services/handlers/dashboard';
import { CoreCoursesDashboardPage } from './pages/dashboard/dashboard.page';
@ -28,12 +28,17 @@ const routes: Routes = [
@NgModule({
imports: [RouterModule.forChild(routes)],
declarations: [],
providers: [
CoreCoursesDashboardHandler,
],
})
export class CoreCoursesModule {
constructor(homeDelegate: CoreHomeDelegate) {
homeDelegate.registerHandler(new CoreCoursesDashboardHandler());
constructor(
homeDelegate: CoreHomeDelegate,
coursesDashboardHandler: CoreCoursesDashboardHandler,
) {
homeDelegate.registerHandler(coursesDashboardHandler);
}
}

View File

@ -12,11 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { Injectable } from '@angular/core';
import { CoreHomeHandler, CoreHomeHandlerData } from '@core/mainmenu/services/home.delegate';
/**
* Handler to add Home into main menu.
*/
Injectable();
export class CoreCoursesDashboardHandler implements CoreHomeHandler {
name = 'CoreCoursesDashboard';

View File

@ -26,7 +26,7 @@ import { CoreMainMenuDelegate } from './services/mainmenu.delegate';
import { CoreMainMenuRoutingModule } from './mainmenu-routing.module';
import { CoreMainMenuPage } from './pages/menu/menu.page';
import { CoreMainMenuMorePage } from './pages/more/more.page';
import { CoreHomeMainMenuHandler } from './handlers/mainmenu';
import { CoreHomeMainMenuHandler } from './services/handlers/mainmenu';
@NgModule({
@ -42,11 +42,17 @@ import { CoreHomeMainMenuHandler } from './handlers/mainmenu';
CoreMainMenuPage,
CoreMainMenuMorePage,
],
providers: [
CoreHomeMainMenuHandler,
],
})
export class CoreMainMenuModule {
constructor(mainMenuDelegate: CoreMainMenuDelegate) {
mainMenuDelegate.registerHandler(new CoreHomeMainMenuHandler());
constructor(
mainMenuDelegate: CoreMainMenuDelegate,
homeMainMenuHandler: CoreHomeMainMenuHandler,
) {
mainMenuDelegate.registerHandler(homeMainMenuHandler);
}
}

View File

@ -12,11 +12,13 @@
// See the License for the specific language governing permissions and
// limitations under the License.
import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../services/mainmenu.delegate';
import { Injectable } from '@angular/core';
import { CoreMainMenuHandler, CoreMainMenuHandlerData } from '../mainmenu.delegate';
/**
* Handler to add Home into main menu.
*/
Injectable();
export class CoreHomeMainMenuHandler implements CoreMainMenuHandler {
name = 'CoreHome';

View File

@ -17,8 +17,9 @@ import { Component, Input, Output, EventEmitter, OnInit } from '@angular/core';
import { CoreSites } from '@services/sites';
import { CoreDomUtils } from '@services/utils/dom';
import { CoreUtils } from '@services/utils/utils';
import { CoreSearchHistory, CoreSearchHistoryItem } from '../../services/search-history';
import { CoreSearchHistory } from '../../services/search-history';
import { Translate } from '@singletons/core.singletons';
import { CoreSearchHistoryDBRecord } from '../../services/search.history.db';
/**
* Component to display a "search box".
@ -59,7 +60,7 @@ export class CoreSearchBoxComponent implements OnInit {
searched = ''; // Last search emitted.
searchText = '';
history: CoreSearchHistoryItem[] = [];
history: CoreSearchHistoryDBRecord[] = [];
historyShown = false;
constructor() {