javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2025-08-24 14:58:36 +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/index.ts
View File

@ -150,7 +150,7 @@ export { Events, setupEvents, setupProvideEvents } from './util/events';
export { IonicErrorHandler } from './util/ionic-error-handler';
export { Keyboard } from './platform/keyboard';
export { Form, IonicFormInput, IonicTapInput } from './util/form';
export { reorderArray } from './util/util';
export { reorderArray, normalizeURL } from './util/util';
export { Animation, AnimationOptions, EffectProperty, EffectState, PlayOptions } from './animations/animation';
export { PageTransition } from './transitions/page-transition';
export { Transition } from './transitions/transition';