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

Merge branch 'master' into v4

Browse Source 
# Conflicts:
#	README.md
#	package.json
#	src/components/action-sheet/action-sheet-component.ts
#	src/components/badge/badge.scss
#	src/components/card/card.ios.scss
#	src/components/card/card.md.scss
#	src/components/card/card.wp.scss
#	src/components/scroll/scroll.scss
#	src/components/scroll/scroll.ts
#	src/components/scroll/test/basic/main.html
#	src/components/slides/slides.scss
#	src/components/slides/swiper/swiper-effects.ts
#	src/components/slides/swiper/swiper-events.ts
#	src/components/slides/swiper/swiper-parallax.ts
#	src/components/slides/swiper/swiper.ts
#	src/components/toggle/test/toggle.spec.ts
#	src/components/toggle/toggle-gesture.ts
#	src/components/toggle/toggle.ios.scss
#	src/components/toggle/toggle.md.scss
#	src/components/toggle/toggle.ts
#	src/components/toggle/toggle.wp.scss
#	src/themes/ionic.mixins.scss
This commit is contained in:
Adam Bradley
2017-05-17 23:03:49 +02:00
parent d5d686ae17 257b5fcc49
commit e50dc31d93
268 changed files with 4202 additions and 2503 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/module.ts
View File

@ -392,7 +392,7 @@ export class IonicModule {
{ provide: APP_INITIALIZER, useFactory: registerModeConfigs, deps: [ Config ], multi: true },
{ provide: APP_INITIALIZER, useFactory: setupCore, deps: [ Config, Platform, DomController, NgZone ], multi: true },
{ provide: APP_INITIALIZER, useFactory: setupProvideEvents, deps: [ Platform, DomController ], multi: true },
{ provide: APP_INITIALIZER, useFactory: setupTapClick, deps: [ Config, Platform, DomController, App, NgZone, GestureController ], multi: true },
{ provide: APP_INITIALIZER, useFactory: setupTapClick, deps: [ Config, Platform, DomController, App, GestureController ], multi: true },
{ provide: APP_INITIALIZER, useFactory: setupPreloading, deps: [ Config, DeepLinkConfigToken, ModuleLoader, NgZone ], multi: true },
// useClass