-import { ApplicationRef, NgModule } from '@angular/core';
-import { BrowserModule } from '@angular/platform-browser';
-import { removeNgStyles, createNewHosts } from '@angularclass/hmr';
-
-import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@nglibs/meta';
-// TODO: remove, we need this to avoid error in ng2-smart-table
-import 'rxjs/add/operator/toPromise';
-import 'bootstrap-loader';
-
-import { ENV_PROVIDERS } from './environment';
-import { AppRoutingModule } from './app-routing.module';
-import { AppComponent } from './app.component';
-import { AppState } from './app.service';
-
-import { AccountModule } from './account';
-import { CoreModule } from './core';
-import { LoginModule } from './login';
-import { SignupModule } from './signup';
-import { SharedModule } from './shared';
-import { VideosModule } from './videos';
-
-export function metaFactory(): MetaLoader {
+import { ApplicationRef, NgModule } from '@angular/core'
+import { BrowserModule } from '@angular/platform-browser'
+import {
+ removeNgStyles,
+ createNewHosts,
+ createInputTransfer
+} from '@angularclass/hmr'
+
+import { MetaModule, MetaLoader, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
+import 'bootstrap-loader'
+
+import { ENV_PROVIDERS } from './environment'
+import { AppRoutingModule } from './app-routing.module'
+import { AppComponent } from './app.component'
+import { AppState, InternalStateType } from './app.service'
+
+import { AccountModule } from './account'
+import { CoreModule } from './core'
+import { LoginModule } from './login'
+import { SignupModule } from './signup'
+import { SharedModule } from './shared'
+import { VideosModule } from './videos'
+import { MenuComponent, MenuAdminComponent } from './menu'
+import { HeaderComponent } from './header'
+
+export function metaFactory (): MetaLoader {
return new MetaStaticLoader({
pageTitlePositioning: PageTitlePositioning.PrependPageTitle,
pageTitleSeparator: ' - ',
title: 'PeerTube',
description: 'PeerTube, a decentralized video streaming platform using P2P (BitTorrent) directly in the web browser'
}
- });
+ })
+}
+
+type StoreType = {
+ state: InternalStateType,
+ restoreInputValues: () => void,
+ disposeOldHosts: () => void
}
// Application wide providers
const APP_PROVIDERS = [
AppState
-];
+]
@NgModule({
bootstrap: [ AppComponent ],
declarations: [
- AppComponent
+ AppComponent,
+
+ MenuComponent,
+ MenuAdminComponent,
+ HeaderComponent
],
imports: [
BrowserModule,
]
})
export class AppModule {
- constructor(public appRef: ApplicationRef, public appState: AppState) {}
- hmrOnInit(store) {
- if (!store || !store.state) return;
- console.log('HMR store', store);
- this.appState._state = store.state;
- this.appRef.tick();
- delete store.state;
+ constructor (
+ public appRef: ApplicationRef,
+ public appState: AppState
+ ) {}
+
+ public hmrOnInit (store: StoreType) {
+ if (!store || !store.state) {
+ return
+ }
+ console.log('HMR store', JSON.stringify(store, null, 2))
+ /**
+ * Set state
+ */
+ this.appState._state = store.state
+ /**
+ * Set input values
+ */
+ if ('restoreInputValues' in store) {
+ let restoreInputValues = store.restoreInputValues
+ setTimeout(restoreInputValues)
+ }
+
+ this.appRef.tick()
+ delete store.state
+ delete store.restoreInputValues
}
- hmrOnDestroy(store) {
- const cmpLocation = this.appRef.components.map(cmp => cmp.location.nativeElement);
- // recreate elements
- const state = this.appState._state;
- store.state = state;
- store.disposeOldHosts = createNewHosts(cmpLocation);
- // remove styles
- removeNgStyles();
+
+ public hmrOnDestroy (store: StoreType) {
+ const cmpLocation = this.appRef.components.map((cmp) => cmp.location.nativeElement)
+ /**
+ * Save state
+ */
+ const state = this.appState._state
+ store.state = state
+ /**
+ * Recreate root elements
+ */
+ store.disposeOldHosts = createNewHosts(cmpLocation)
+ /**
+ * Save input values
+ */
+ store.restoreInputValues = createInputTransfer()
+ /**
+ * Remove styles
+ */
+ removeNgStyles()
}
- hmrAfterDestroy(store) {
- // display new elements
- store.disposeOldHosts();
- delete store.disposeOldHosts;
+
+ public hmrAfterDestroy (store: StoreType) {
+ /**
+ * Display new elements
+ */
+ store.disposeOldHosts()
+ delete store.disposeOldHosts
}
}