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

remove init.js, users must explicitly call System.import

Browse Source
This commit is contained in:
Tim Lancina
2015-08-06 13:26:35 -05:00
parent 64e6fb3d5f
commit 9cf986eefc
3 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
gulpfile.js
View File

@ -39,7 +39,6 @@ var tscOptions = {
target: 'ES6', target: 'ES6',
allowNonTsExtensions: true, allowNonTsExtensions: true,
isolatedModules: true, isolatedModules: true,
//declaration: true, //generate d.ts files
emitDecoratorMetadata: true, emitDecoratorMetadata: true,
experimentalDecorators: true, experimentalDecorators: true,
noEmitOnError: false, // ignore errors noEmitOnError: false, // ignore errors
@ -123,7 +122,6 @@ function transpile(moduleType) {
'ionic/**/*.js', 'ionic/**/*.js',
'!ionic/components/*/test/**/*', '!ionic/components/*/test/**/*',
'!ionic/util/hairline.js', '!ionic/util/hairline.js',
'!ionic/init.js',
'!ionic/util/test/*' '!ionic/util/test/*'
]) ])
.pipe(cache('transpile', { optimizeMemory: true })) .pipe(cache('transpile', { optimizeMemory: true }))
@ -147,7 +145,7 @@ gulp.task('transpile.common', function() { return transpile("common"); });
gulp.task('transpile', ['transpile.system']); gulp.task('transpile', ['transpile.system']);
gulp.task('bundle.js', function() { gulp.task('bundle.js', function() {
return gulp.src(['dist/js/es5/system/ionic/**/*.js', 'ionic/util/hairline.js', 'ionic/init.js']) return gulp.src(['dist/js/es5/system/ionic/**/*.js', 'ionic/util/hairline.js'])
.pipe(concat('ionic.bundle.js')) .pipe(concat('ionic.bundle.js'))
.pipe(gulp.dest('dist/js/')); .pipe(gulp.dest('dist/js/'));
}); });

17
ionic/init.js
View File

@ -1,17 +0,0 @@
(function(document){
var ionicImport = System.import('ionic/components/app/app');
function importApp(module) {
if (module) {
System.import(module);
}
}
var ele = document.querySelectorAll('[module]');
for (var i = 0; i < ele.length; i++) {
importApp(ele[i].getAttribute('module'));
}
})(document);

3
scripts/e2e/e2e.template.html
View File

@ -35,7 +35,7 @@
</head> </head>
<body> <body>
<ion-app module="{{MODULE}}"> <ion-app>
<ion-loading-icon></ion-loading-icon> <ion-loading-icon></ion-loading-icon>
</ion-app> </ion-app>
@ -55,6 +55,7 @@
<!-- web animations polyfill for non-chrome browsers --> <!-- web animations polyfill for non-chrome browsers -->
<script src="../../../lib/web-animations.min.js"></script> <script src="../../../lib/web-animations.min.js"></script>
<script>System.import("{{MODULE}}");</script>
</body> </body>
</html> </html>