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

Merge branch 'master' into searchbar-fix

Browse Source 
# Conflicts:
#	ionic/components/searchbar/searchbar.ts
This commit is contained in:
Brandy Carney
2015-12-10 17:55:44 -05:00
parent ab4ad905a8
commit ff8169cb0a
84 changed files with 634 additions and 534 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ionic/ionic.ts
View File

@ -1,14 +1,12 @@
export * from './config/bootstrap'
export * from './config/config'
export * from './config/modes'
export * from './config/decorators'
export * from './config/directives'
export * from './components'
export * from './platform/platform'
export * from './platform/registry'
export * from './platform/storage'
export * from './util/click-block'
@ -16,9 +14,15 @@ export * from './util/events'
export * from './util/keyboard'
export * from './animations/animation'
export * from './animations/builtins'
export * from './animations/ios-transition'
export * from './animations/md-transition'
export * from './translation/translate'
export * from './translation/translate_pipe'
// these modules don't export anything
import './config/modes'
import './platform/registry'
import './animations/builtins'
import './animations/ios-transition'
import './animations/md-transition'