javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-19 19:57:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(exports): update module exports

Browse Source
This commit is contained in:
Adam Bradley
2016-09-14 15:54:20 -05:00
parent 8585427fb4
commit 6784f5e744
8 changed files with 67 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

88
src/module.ts
View File

@ -1,17 +1,18 @@
import { ANALYZE_FOR_ENTRY_COMPONENTS, ModuleWithProviders, NgModule } from '@angular/core';
import { ANALYZE_FOR_ENTRY_COMPONENTS, APP_INITIALIZER, ModuleWithProviders, NgModule, NgZone } from '@angular/core';
import { Location, LocationStrategy, HashLocationStrategy } from '@angular/common';
import { BrowserModule, HAMMER_GESTURE_CONFIG } from '@angular/platform-browser';
import { FormsModule, ReactiveFormsModule } from '@angular/forms';
import { HttpModule } from '@angular/http';
/**
* Import Providers
*/
import { ActionSheetController } from './components/action-sheet/action-sheet';
import { AlertController } from './components/alert/alert';
import { App } from './components/app/app';
import { provideConfig } from './config/config';
import { provideEvents } from './util/events';
import { Config, UserConfig, setupConfig } from './config/config';
import { DeepLinker, setupDeepLinker, UserDeepLinkConfig } from './navigation/deep-linker';
import { setupProvideEvents } from './util/events';
import { FeatureDetect } from './util/feature-detect';
import { Form } from './util/form';
import { GestureController } from './gestures/gesture-controller';
@ -21,26 +22,19 @@ import { LoadingController } from './components/loading/loading';
import { MenuController } from './components/menu/menu-controller';
import { ModalController } from './components/modal/modal';
import { PickerController } from './components/picker/picker';
import { providePlatform, UserAgent, UserNavigatorPlatform, UserDir, UserLang } from './platform/platform';
import { Platform, setupPlatform, UserAgent, UserNavigatorPlatform, UserDir, UserLang } from './platform/platform';
import { PopoverController } from './components/popover/popover';
import { provideDeepLinker } from './navigation/deep-linker';
import { provideQueryParams, UserUrl } from './platform/query-params';
import { TapClick, provideTapClick } from './components/tap-click/tap-click';
import { QueryParams, setupQueryParams, UserUrl } from './platform/query-params';
import { TapClick, setupTapClick } from './components/tap-click/tap-click';
import { ToastController } from './components/toast/toast';
import { Translate } from './translation/translate';
import { TransitionController } from './transitions/transition-controller';
import { UserRoot } from './components/app/app-root';
import { UrlSerializer } from './navigation/url-serializer';
/**
* Export Providers
* Import Overlay Entry Components
*/
export { DeepLinker, provideDeepLinker } from './navigation/deep-linker';
export { NavController } from './navigation/nav-controller';
export { NavParams } from './navigation/nav-params';
export { NavLink, NavOptions, DeepLink, DeepLinkConfig } from './navigation/nav-util';
export { ViewController } from './navigation/view-controller';
import { ActionSheetCmp } from './components/action-sheet/action-sheet-component';
import { AlertCmp } from './components/alert/alert-component';
import { IONIC_DIRECTIVES } from './directives';
@ -51,6 +45,16 @@ import { PickerCmp } from './components/picker/picker-component';
import { PopoverCmp } from './components/popover/popover-component';
import { ToastCmp } from './components/toast/toast-component';
/**
* Export Providers
*/
export { DeepLinker, UserDeepLinkConfig } from './navigation/deep-linker';
export { NavController } from './navigation/nav-controller';
export { NavParams } from './navigation/nav-params';
export { NavLink, NavOptions, DeepLink, DeepLinkConfig } from './navigation/nav-util';
export { UrlSerializer } from './navigation/url-serializer';
export { ViewController } from './navigation/view-controller';
@NgModule({
imports: [BrowserModule, HttpModule, FormsModule, ReactiveFormsModule],
@ -83,20 +87,54 @@ export class IonicModule {
ngModule: IonicModule,
providers: [
{ provide: ANALYZE_FOR_ENTRY_COMPONENTS, useValue: userAppRoot, multi: true },
{ provide: APP_INITIALIZER, useFactory: setupTapClick,
deps: [
Config,
App,
NgZone
],
multi: true
},
{ provide: APP_INITIALIZER, useFactory: setupProvideEvents, deps: [ Platform ], multi: true },
{ provide: Config, useFactory: setupConfig,
deps: [
UserConfig,
QueryParams,
Platform
]
},
{ provide: DeepLinker, useFactory: setupDeepLinker,
deps: [
App,
UrlSerializer,
Location
]
},
{ provide: HAMMER_GESTURE_CONFIG, useClass: IonicGestureConfig },
{ provide: LocationStrategy, useClass: HashLocationStrategy },
{ provide: Platform, useFactory: setupPlatform,
deps: [
QueryParams,
UserAgent,
UserNavigatorPlatform,
UserDir,
UserLang,
NgZone
]
},
{ provide: QueryParams, useFactory: setupQueryParams,
deps: [
UserUrl
]
},
{ provide: UserAgent, useFactory: getWindowUserAgent },
{ provide: UserDir, useFactory: getDocumentDir },
{ provide: UserLang, useFactory: getDocumentLang },
{ provide: UserNavigatorPlatform, useFactory: getWindowPlatform },
{ provide: UserRoot, useValue: userAppRoot },
{ provide: UserUrl, useFactory: getWindowLocation },
provideConfig(userConfig),
provideDeepLinker(userDeepLinkConfig),
provideEvents(),
providePlatform(),
provideQueryParams(),
provideTapClick(),
{ provide: UserConfig, useValue: userConfig },
{ provide: UserDeepLinkConfig, useValue: userDeepLinkConfig },
ActionSheetController,
AlertController,
@ -106,6 +144,7 @@ export class IonicModule {
GestureController,
Keyboard,
LoadingController,
Location,
MenuController,
ModalController,
PickerController,
@ -113,7 +152,8 @@ export class IonicModule {
TapClick,
ToastController,
Translate,
TransitionController
TransitionController,
UrlSerializer
]
};
}