From d8eea75736ae3742a8d1a24e89db076e4089b877 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 11 May 2015 22:33:32 -0500 Subject: [PATCH] i put the break in changes --- README.md | 32 ++-- gulpfile.js | 152 ++++++------------ .../action-menu/test/basic/index.js | 21 +++ .../components/action-menu/test/basic/main.js | 16 -- .../alert/test/basic/{main.js => index.js} | 11 +- .../app/test/animations/{main.js => index.js} | 11 +- .../app/test/barkpark/{main.js => index.js} | 11 +- .../app/test/hn/{main.js => index.js} | 14 +- ionic/components/app/test/typography/index.js | 18 +++ ionic/components/app/test/typography/main.js | 13 -- ionic/components/aside/test/basic/index.js | 20 +++ ionic/components/aside/test/basic/main.js | 16 -- ionic/components/button/button.js | 19 +-- ionic/components/button/test/basic/index.js | 19 +++ ionic/components/button/test/basic/main.js | 14 -- ionic/components/button/test/block/index.js | 18 +++ ionic/components/button/test/block/main.js | 12 -- ionic/components/button/test/clear/index.js | 18 +++ ionic/components/button/test/clear/main.js | 12 -- ionic/components/button/test/full/index.js | 18 +++ ionic/components/button/test/full/main.js | 12 -- ionic/components/button/test/icons/index.js | 18 +++ ionic/components/button/test/icons/main.js | 12 -- ionic/components/button/test/outline/index.js | 18 +++ ionic/components/button/test/outline/main.js | 12 -- ionic/components/button/test/sizes/index.js | 18 +++ ionic/components/button/test/sizes/main.js | 12 -- ionic/components/card/test/basic/index.js | 23 +++ ionic/components/card/test/basic/main.js | 17 -- .../checkbox/test/basic/{main.js => index.js} | 12 +- ionic/components/content/content.js | 8 +- .../content/test/basic/{main.js => index.js} | 12 +- .../pull-to-refresh/{main.js => index.js} | 7 +- ionic/components/form/input/input.js | 15 +- ionic/components/form/label/label.js | 15 +- .../form/test/basic/{main.js => index.js} | 12 +- ionic/components/icon/icon.js | 9 +- .../{basic/main.js => accessories/index.js} | 8 +- .../{accessories/main.js => basic/index.js} | 14 +- ionic/components/layout/test/basic/index.js | 23 +++ ionic/components/layout/test/basic/main.js | 17 -- ionic/components/list/list.js | 17 +- .../list/test/basic/{main.js => index.js} | 12 +- .../nav/test/basic/{main.js => index.js} | 10 +- .../radio/test/basic/{main.js => index.js} | 12 +- ionic/components/scroll/pull-to-refresh.js | 7 +- .../test/basic/{main.js => index.js} | 12 +- .../segment/test/basic/{main.js => index.js} | 12 +- ionic/components/switch/switch.js | 5 +- .../switch/test/basic/{main.js => index.js} | 12 +- ionic/components/tabs/test/advanced/index.js | 24 +++ ionic/components/tabs/test/advanced/main.js | 18 --- .../tabs/test/advanced/pages/sign-in.js | 4 +- .../tabs/test/advanced/pages/tabs.js | 2 +- .../tabs/test/basic/{main.js => index.js} | 12 +- .../tabs/test/tab-bar-bottom/index.js | 22 +++ .../tabs/test/tab-bar-bottom/main.js | 16 -- .../tabs/test/tab-bar-icons/index.js | 19 +++ .../tabs/test/tab-bar-icons/main.js | 14 -- .../components/tabs/test/tab-bar-top/index.js | 22 +++ .../components/tabs/test/tab-bar-top/main.js | 16 -- .../toolbar/test/html-title/index.js | 20 +++ .../toolbar/test/html-title/main.js | 15 -- .../toolbar/test/long-title/index.js | 20 +++ .../toolbar/test/long-title/main.js | 15 -- .../toolbar/test/lopsided-buttons/index.js | 20 +++ .../toolbar/test/lopsided-buttons/main.js | 15 -- package.json | 1 + scripts/e2e/angular.template.html | 20 +-- 69 files changed, 651 insertions(+), 502 deletions(-) create mode 100644 ionic/components/action-menu/test/basic/index.js delete mode 100644 ionic/components/action-menu/test/basic/main.js rename ionic/components/alert/test/basic/{main.js => index.js} (50%) rename ionic/components/app/test/animations/{main.js => index.js} (91%) rename ionic/components/app/test/barkpark/{main.js => index.js} (92%) rename ionic/components/app/test/hn/{main.js => index.js} (53%) create mode 100644 ionic/components/app/test/typography/index.js delete mode 100644 ionic/components/app/test/typography/main.js create mode 100644 ionic/components/aside/test/basic/index.js delete mode 100644 ionic/components/aside/test/basic/main.js create mode 100644 ionic/components/button/test/basic/index.js delete mode 100644 ionic/components/button/test/basic/main.js create mode 100644 ionic/components/button/test/block/index.js delete mode 100644 ionic/components/button/test/block/main.js create mode 100644 ionic/components/button/test/clear/index.js delete mode 100644 ionic/components/button/test/clear/main.js create mode 100644 ionic/components/button/test/full/index.js delete mode 100644 ionic/components/button/test/full/main.js create mode 100644 ionic/components/button/test/icons/index.js delete mode 100644 ionic/components/button/test/icons/main.js create mode 100644 ionic/components/button/test/outline/index.js delete mode 100644 ionic/components/button/test/outline/main.js create mode 100644 ionic/components/button/test/sizes/index.js delete mode 100644 ionic/components/button/test/sizes/main.js create mode 100644 ionic/components/card/test/basic/index.js delete mode 100644 ionic/components/card/test/basic/main.js rename ionic/components/checkbox/test/basic/{main.js => index.js} (63%) rename ionic/components/content/test/basic/{main.js => index.js} (57%) rename ionic/components/content/test/pull-to-refresh/{main.js => index.js} (87%) rename ionic/components/form/test/basic/{main.js => index.js} (71%) rename ionic/components/item/test/{basic/main.js => accessories/index.js} (80%) rename ionic/components/item/test/{accessories/main.js => basic/index.js} (50%) create mode 100644 ionic/components/layout/test/basic/index.js delete mode 100644 ionic/components/layout/test/basic/main.js rename ionic/components/list/test/basic/{main.js => index.js} (52%) rename ionic/components/nav/test/basic/{main.js => index.js} (90%) rename ionic/components/radio/test/basic/{main.js => index.js} (58%) rename ionic/components/search-bar/test/basic/{main.js => index.js} (54%) rename ionic/components/segment/test/basic/{main.js => index.js} (63%) rename ionic/components/switch/test/basic/{main.js => index.js} (67%) create mode 100644 ionic/components/tabs/test/advanced/index.js delete mode 100644 ionic/components/tabs/test/advanced/main.js rename ionic/components/tabs/test/basic/{main.js => index.js} (68%) create mode 100644 ionic/components/tabs/test/tab-bar-bottom/index.js delete mode 100644 ionic/components/tabs/test/tab-bar-bottom/main.js create mode 100644 ionic/components/tabs/test/tab-bar-icons/index.js delete mode 100644 ionic/components/tabs/test/tab-bar-icons/main.js create mode 100644 ionic/components/tabs/test/tab-bar-top/index.js delete mode 100644 ionic/components/tabs/test/tab-bar-top/main.js create mode 100644 ionic/components/toolbar/test/html-title/index.js delete mode 100644 ionic/components/toolbar/test/html-title/main.js create mode 100644 ionic/components/toolbar/test/long-title/index.js delete mode 100644 ionic/components/toolbar/test/long-title/main.js create mode 100644 ionic/components/toolbar/test/lopsided-buttons/index.js delete mode 100644 ionic/components/toolbar/test/lopsided-buttons/main.js diff --git a/README.md b/README.md index 1445902aea..f8aaf01efd 100644 --- a/README.md +++ b/README.md @@ -1,15 +1,29 @@ #### Building & Running -- `gulp watch` -- `httpster` -- `open http://localhost:9000/e2e/aside/basic/index.html` -- Follow the structure found in src/components/aside/examples/basic - to create more examples. - * The biggest thing to remember: your app has to import its dependencies with the `app/` prefix. - For example `import {Apple} from 'apple';` would import apple.js in your example app. +_** WARNING: This is a temporary hack **_ + +1. At the root of your `ionic2` directory/repo, run: `gulp update.angular`. This will get the latest version of Angular2 master and install it as a sibling directory `../angular` to wherever your `ionic2` directory is. (It'll take a while to npm install angular2, so go grab a beer). +2. In the `ionic2` working directory, run `gulp watch`. This will copy ionic2 components and test files to the correct angular directories as you're developing. +3. In another terminal, `cd` into the `../angular` directory, and run `gulp serve.js.dev`. This will build out ionic examples too. +4. Go to [http://localhost:8000/examples/src/ionic/](http://localhost:8000/examples/src/ionic/) +5. Stay cool + +_** WARNING: This is a temporary hack **_ -#### Update Angular +#### Things you'll probably need to fix + +- `@Decorator` is now just `@Directive` +- Components must use an element selector +- NgElement is not longer a thing, it's now ElementRef. Stuff needs to be fixed. +- All `main.js` test files were renamed to `index.js` to work with angular's build +- imports that are relative paths should start with `./`. For example, instead of `path/module` it should be `./path/module` +- `Component`, `Directive` and `View` should NOT be imported from `angular2/angular2`. You'll probably get "No Directive annotation found on Content" when the wrong import is referenced. +- Import those instead from: + +``` +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; +``` - ./scripts/build/update-angular.sh diff --git a/gulpfile.js b/gulpfile.js index d047783fa3..841532c0d2 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -13,34 +13,44 @@ var gulpif = require('gulp-if'); var rename = require('gulp-rename'); var sass = require('gulp-sass'); var through2 = require('through2'); -var exec = require('child_process').exec; -var spawn = require('child_process').spawn; var runSequence = require('run-sequence'); +var watch = require('gulp-watch'); // !!! TEMP HACK !!! // first run ./update-angular.sh -gulp.task('build', function(done) { - - if (!fs.existsSync('./dist/angular')) { - console.error('hey yo, run "gulp update.angular" first'); - return; - } +gulp.task('watch', function() { runSequence( + 'clean', 'ionic.copy.js', 'ionic.examples', - 'angular.build', - done - ); + 'sass', + function() { + watch('ionic/**/*.js', function() { + gulp.start('ionic.copy.js'); + }); + + watch('ionic/components/*/test/**/*', function() { + gulp.start('ionic.examples'); + }); + + watch('ionic/components/**/*.scss', function() { + gulp.start('sass'); + }); + }) + +}); + +gulp.task('clean', function(done) { + del(['../angular/modules/ionic, ./angular/modules/examples/src/ionic'], done); }); gulp.task('ionic.copy.js', function(done) { - console.log('copying ionic src JS to dist/angular/modules/ionic...'); - return gulp.src('ionic/**/*.js') - .pipe(gulp.dest('dist/angular/modules/ionic')); + return gulp.src(['ionic/**/*.js', '!ionic/components/*/test/**/*']) + .pipe(gulp.dest('../angular/modules/ionic')); }); @@ -51,12 +61,11 @@ gulp.task('ionic.examples', function() { // Get each test folder with gulp.src return gulp.src('ionic/components/*/test/*/**/*') - .pipe(cached('ionicexamples')) .pipe(rename(function(file) { file.dirname = file.dirname.replace(path.sep + 'test' + path.sep, path.sep) })) - .pipe(gulpif(/main.js$/, processMain())) - .pipe(gulp.dest('dist/angular/modules/examples/src/ionic')) + .pipe(gulpif(/index.js$/, processMain())) + .pipe(gulp.dest('../angular/modules/examples/src/ionic')) function processMain() { return through2.obj(function(file, enc, next) { @@ -73,73 +82,33 @@ gulp.task('ionic.examples', function() { }); -gulp.task('serve', function(done) { - - runSequence( - 'build', - 'angular.serve', - done - ); - -}); - - -gulp.task('angular.serve', function(done) { - - var serve = spawn('gulp', ['serve.js.dev'], { - cwd: './dist/angular' - }); - - serve.stdout.on('data', function (data) { - console.log('' + data); - }); - - serve.stderr.on('data', function (data) { - console.log('' + data); - }); - - serve.on('close', function (code) { - console.log('gulp serve exited with code ' + code); - }); - -}); - - -gulp.task('angular.build', function(done) { - - var child = exec('gulp build.js.dev', { - cwd: './dist/angular' - }, function (error, stdout, stderr) { - console.log('stdout: ' + stdout); - console.log('stderr: ' + stderr); - if (error !== null) { - console.log('exec error: ' + error); - } - done(); - }); - +gulp.task('sass', function() { + return gulp.src('ionic/ionic.scss') + .pipe(sass({ + onError: function(err) { + console.log(err) + } + })) + .pipe(gulp.dest('dist/css')); }); gulp.task('update.angular', function(done) { - if (!fs.existsSync('./dist')) { - fs.mkdirSync('./dist'); - } - if (!fs.existsSync('./dist/angular')) { - fs.mkdirSync('./dist/angular'); + if (!fs.existsSync('../angular')) { + fs.mkdirSync('../angular'); console.log('cloning angular master...'); - exec('git clone git@github.com:angular/angular ./dist/angular', function() { + exec('git clone git@github.com:angular/angular ../angular', function() { npmInstall(); }); } else { console.log('angular master: cleaning modules'); - del(['dist/angular/modules'], {cwd: './dist/angular'}, function() { + del(['../angular/modules'], function() { console.log('angular master: reset --hard...'); - exec('git reset --hard origin/master', {cwd: './dist/angular'}, function () { + exec('git reset --hard origin/master', {cwd: '../angular'}, function () { console.log('angular master: git pull origin master...'); exec('git pull origin master', function () { @@ -152,7 +121,7 @@ gulp.task('update.angular', function(done) { function npmInstall() { console.log('angular master: npm install (may take a while, chill out)...'); - exec('npm install', {cwd: './dist/angular'}, function () { + exec('npm install', {cwd: '../angular'}, function () { done(); }); } @@ -161,25 +130,20 @@ gulp.task('update.angular', function(done) { - require('./scripts/snapshot/snapshot.task')(gulp, argv, buildConfig); -gulp.task('default', ['clean'], function() { - gulp.run('build'); -}); - -gulp.task('watch', ['default'], function() { - gulp.watch(buildConfig.src.scss, ['sass']) - gulp.watch([].concat( - buildConfig.src.js, buildConfig.src.html, - 'scripts/e2e/index.template.html' - ), ['e2e']) - gulp.watch([].concat( - buildConfig.src.e2e, buildConfig.src.html, - 'scripts/e2e/index.template.html' - ), ['ionic-js']) -}); +// gulp.task('watch', ['default'], function() { +// gulp.watch(buildConfig.src.scss, ['sass']) +// gulp.watch([].concat( +// buildConfig.src.js, buildConfig.src.html, +// 'scripts/e2e/index.template.html' +// ), ['e2e']) +// gulp.watch([].concat( +// buildConfig.src.e2e, buildConfig.src.html, +// 'scripts/e2e/index.template.html' +// ), ['ionic-js']) +// }); gulp.task('karma', function() { return karma.start({ configFile: __dirname + '/scripts/test/karma.conf.js' }) @@ -189,26 +153,12 @@ gulp.task('karma-watch', function() { return karma.start({ configFile: __dirname + '/scripts/test/karma-watch.conf.js' }) }); -gulp.task('sass', function() { - return gulp.src('ionic/ionic.scss') - .pipe(sass({ - onError: function(err) { - console.log(err) - } - })) - .pipe(gulp.dest('dist/css')); -}); - gulp.task('fonts', function() { return gulp.src('ionic/components/icon/fonts/**/*') .pipe(gulp.dest('dist/fonts')); }); -gulp.task('clean', function(done) { - del(['dist/e2e'], done); -}); - diff --git a/ionic/components/action-menu/test/basic/index.js b/ionic/components/action-menu/test/basic/index.js new file mode 100644 index 0000000000..d09a9a6a1f --- /dev/null +++ b/ionic/components/action-menu/test/basic/index.js @@ -0,0 +1,21 @@ +import {bootstrap} from 'angular2/angular2' +import {Component} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {ActionMenu} from 'ionic/components/action-menu/action-menu'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [ActionMenu] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/action-menu/test/basic/main.js b/ionic/components/action-menu/test/basic/main.js deleted file mode 100644 index c7241870fa..0000000000 --- a/ionic/components/action-menu/test/basic/main.js +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; -import {ActionMenu} from 'ionic/components/action-menu/action-menu'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [ActionMenu] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/alert/test/basic/main.js b/ionic/components/alert/test/basic/index.js similarity index 50% rename from ionic/components/alert/test/basic/main.js rename to ionic/components/alert/test/basic/index.js index 87d1337ce9..bdd37082f3 100644 --- a/ionic/components/alert/test/basic/main.js +++ b/ionic/components/alert/test/basic/index.js @@ -1,8 +1,11 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; +import {bootstrap} from 'angular2/angular2' +import {Component} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Alert} from 'ionic/components/alert/alert'; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Alert] @@ -19,4 +22,6 @@ class IonicApp { } } -bootstrap(IonicApp) +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/app/test/animations/main.js b/ionic/components/app/test/animations/index.js similarity index 91% rename from ionic/components/app/test/animations/main.js rename to ionic/components/app/test/animations/index.js index 56b54abcc7..86cf0244fc 100644 --- a/ionic/components/app/test/animations/main.js +++ b/ionic/components/app/test/animations/index.js @@ -1,4 +1,7 @@ -import {Component, Decorator, View, NgElement, bootstrap} from 'angular2/angular2'; +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Animation} from 'ionic/ionic'; let opacity = 0.2; @@ -6,7 +9,7 @@ let rotateZ = '180deg'; let translateX = '100px'; let scale = 0.6; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html' }) @@ -143,4 +146,6 @@ class IonicApp { } -bootstrap(IonicApp) +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/app/test/barkpark/main.js b/ionic/components/app/test/barkpark/index.js similarity index 92% rename from ionic/components/app/test/barkpark/main.js rename to ionic/components/app/test/barkpark/index.js index bfd405b062..ae5dcc28b8 100644 --- a/ionic/components/app/test/barkpark/main.js +++ b/ionic/components/app/test/barkpark/index.js @@ -1,5 +1,8 @@ //import {Router} from 'ionic/routing/router' -import {For, Component, View, Parent, bootstrap} from 'angular2/angular2' +import {For, Parent, bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {Log} from 'ionic/util' @@ -152,7 +155,7 @@ class SplashPage { /** * Main app entry point */ -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ directives: [Nav], templateUrl: 'main.html' @@ -194,4 +197,6 @@ class IonicApp { } } -bootstrap(IonicApp); +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/app/test/hn/main.js b/ionic/components/app/test/hn/index.js similarity index 53% rename from ionic/components/app/test/hn/main.js rename to ionic/components/app/test/hn/index.js index d56c86ab71..1a9c734c31 100644 --- a/ionic/components/app/test/hn/main.js +++ b/ionic/components/app/test/hn/index.js @@ -1,16 +1,20 @@ -import {Descendent, NgElement, Component, View, bootstrap} from 'angular2/angular2'; +import {NgElement} from 'angular2/angular2'; +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {bind} from 'angular2/di'; import {Content, Nav, NavPane} from 'ionic/ionic'; import {HackerNews} from 'hn'; import {HNTopStories} from 'pages/top'; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Content, Nav, NavPane] }) -export class HNApp { +export class IonicApp { constructor( @NgElement() element:NgElement ) { @@ -20,5 +24,7 @@ export class HNApp { } } -bootstrap(HNApp); +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/app/test/typography/index.js b/ionic/components/app/test/typography/index.js new file mode 100644 index 0000000000..56917551fc --- /dev/null +++ b/ionic/components/app/test/typography/index.js @@ -0,0 +1,18 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html' +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/app/test/typography/main.js b/ionic/components/app/test/typography/main.js deleted file mode 100644 index f43032d520..0000000000 --- a/ionic/components/app/test/typography/main.js +++ /dev/null @@ -1,13 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html' -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/aside/test/basic/index.js b/ionic/components/aside/test/basic/index.js new file mode 100644 index 0000000000..4552f6153f --- /dev/null +++ b/ionic/components/aside/test/basic/index.js @@ -0,0 +1,20 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Aside} from 'ionic/components/aside/aside'; + + +@Component({ + selector: 'ion-app' +}) +@View({ + directives: [Aside, Content], + templateUrl: 'main.html' +}) +class IonicApp { +} + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/aside/test/basic/main.js b/ionic/components/aside/test/basic/main.js deleted file mode 100644 index dbdd2a54a6..0000000000 --- a/ionic/components/aside/test/basic/main.js +++ /dev/null @@ -1,16 +0,0 @@ -import {Aside} from 'ionic/components/aside/aside'; -import {Content} from 'ionic/components/content/content'; -import {View, Component, bootstrap} from 'angular2/angular2'; - - -@Component({ - selector: '[ion-app]' -}) -@View({ - directives: [Aside, Content], - templateUrl: 'main.html' -}) -class App { -} - -bootstrap(App); diff --git a/ionic/components/button/button.js b/ionic/components/button/button.js index 90dbb482ef..d2fc55045d 100644 --- a/ionic/components/button/button.js +++ b/ionic/components/button/button.js @@ -1,18 +1,19 @@ -import {NgElement, Decorator} from 'angular2/angular2' +import {NgElement} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; + import {IonicComponent} from 'ionic/config/component' -@Decorator({ +@Directive({ selector: 'button, ion-button, [ion-button],.button', }) export class Button { constructor( - @NgElement() ngElement:NgElement + //@NgElement() ngElement:NgElement ) { - this.domElement = ngElement.domElement - this.config = Button.config.invoke(this) + //this.domElement = ngElement.domElement } } -new IonicComponent(Button, { - enhanceRawElement: true, - propClasses: ['primary', 'secondary', 'danger', 'light', 'stable', 'dark', 'block', 'clear', 'full', 'icon'] -}) +// new IonicComponent(Button, { +// enhanceRawElement: true, +// propClasses: ['primary', 'secondary', 'danger', 'light', 'stable', 'dark', 'block', 'clear', 'full', 'icon'] +// }) diff --git a/ionic/components/button/test/basic/index.js b/ionic/components/button/test/basic/index.js new file mode 100644 index 0000000000..99a51f4bfa --- /dev/null +++ b/ionic/components/button/test/basic/index.js @@ -0,0 +1,19 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Button} from 'ionic/components/button/button' + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Button] +}) +class IonicApp { + constructor() { + } +} + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/button/test/basic/main.js b/ionic/components/button/test/basic/main.js deleted file mode 100644 index fccc6cccec..0000000000 --- a/ionic/components/button/test/basic/main.js +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Button} from 'ionic/components/button/button' - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Button] -}) -class IonicApp { - constructor() { - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/button/test/block/index.js b/ionic/components/button/test/block/index.js new file mode 100644 index 0000000000..e6d5b28805 --- /dev/null +++ b/ionic/components/button/test/block/index.js @@ -0,0 +1,18 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Button} from 'ionic/components/button/button' + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Button] +}) +class IonicApp {} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/button/test/block/main.js b/ionic/components/button/test/block/main.js deleted file mode 100644 index bb9e663184..0000000000 --- a/ionic/components/button/test/block/main.js +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Button} from 'ionic/components/button/button' - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Button] -}) -class IonicApp {} - -bootstrap(IonicApp) diff --git a/ionic/components/button/test/clear/index.js b/ionic/components/button/test/clear/index.js new file mode 100644 index 0000000000..e6d5b28805 --- /dev/null +++ b/ionic/components/button/test/clear/index.js @@ -0,0 +1,18 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Button} from 'ionic/components/button/button' + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Button] +}) +class IonicApp {} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/button/test/clear/main.js b/ionic/components/button/test/clear/main.js deleted file mode 100644 index bb9e663184..0000000000 --- a/ionic/components/button/test/clear/main.js +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Button} from 'ionic/components/button/button' - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Button] -}) -class IonicApp {} - -bootstrap(IonicApp) diff --git a/ionic/components/button/test/full/index.js b/ionic/components/button/test/full/index.js new file mode 100644 index 0000000000..e6d5b28805 --- /dev/null +++ b/ionic/components/button/test/full/index.js @@ -0,0 +1,18 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Button} from 'ionic/components/button/button' + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Button] +}) +class IonicApp {} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/button/test/full/main.js b/ionic/components/button/test/full/main.js deleted file mode 100644 index bb9e663184..0000000000 --- a/ionic/components/button/test/full/main.js +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Button} from 'ionic/components/button/button' - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Button] -}) -class IonicApp {} - -bootstrap(IonicApp) diff --git a/ionic/components/button/test/icons/index.js b/ionic/components/button/test/icons/index.js new file mode 100644 index 0000000000..e6d5b28805 --- /dev/null +++ b/ionic/components/button/test/icons/index.js @@ -0,0 +1,18 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Button} from 'ionic/components/button/button' + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Button] +}) +class IonicApp {} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/button/test/icons/main.js b/ionic/components/button/test/icons/main.js deleted file mode 100644 index bb9e663184..0000000000 --- a/ionic/components/button/test/icons/main.js +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Button} from 'ionic/components/button/button' - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Button] -}) -class IonicApp {} - -bootstrap(IonicApp) diff --git a/ionic/components/button/test/outline/index.js b/ionic/components/button/test/outline/index.js new file mode 100644 index 0000000000..e6d5b28805 --- /dev/null +++ b/ionic/components/button/test/outline/index.js @@ -0,0 +1,18 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Button} from 'ionic/components/button/button' + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Button] +}) +class IonicApp {} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/button/test/outline/main.js b/ionic/components/button/test/outline/main.js deleted file mode 100644 index bb9e663184..0000000000 --- a/ionic/components/button/test/outline/main.js +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Button} from 'ionic/components/button/button' - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Button] -}) -class IonicApp {} - -bootstrap(IonicApp) diff --git a/ionic/components/button/test/sizes/index.js b/ionic/components/button/test/sizes/index.js new file mode 100644 index 0000000000..e6d5b28805 --- /dev/null +++ b/ionic/components/button/test/sizes/index.js @@ -0,0 +1,18 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Button} from 'ionic/components/button/button' + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Button] +}) +class IonicApp {} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/button/test/sizes/main.js b/ionic/components/button/test/sizes/main.js deleted file mode 100644 index bb9e663184..0000000000 --- a/ionic/components/button/test/sizes/main.js +++ /dev/null @@ -1,12 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Button} from 'ionic/components/button/button' - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Button] -}) -class IonicApp {} - -bootstrap(IonicApp) diff --git a/ionic/components/card/test/basic/index.js b/ionic/components/card/test/basic/index.js new file mode 100644 index 0000000000..3bce804e4d --- /dev/null +++ b/ionic/components/card/test/basic/index.js @@ -0,0 +1,23 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Content} from 'ionic/components/content/content'; +import {List} from 'ionic/components/list/list'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Content, List] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/card/test/basic/main.js b/ionic/components/card/test/basic/main.js deleted file mode 100644 index eeadc37520..0000000000 --- a/ionic/components/card/test/basic/main.js +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; -import {Content} from 'ionic/components/content/content'; -import {List} from 'ionic/components/list/list'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Content, List] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/checkbox/test/basic/main.js b/ionic/components/checkbox/test/basic/index.js similarity index 63% rename from ionic/components/checkbox/test/basic/main.js rename to ionic/components/checkbox/test/basic/index.js index 1d618e75fe..239777718b 100644 --- a/ionic/components/checkbox/test/basic/main.js +++ b/ionic/components/checkbox/test/basic/index.js @@ -1,8 +1,11 @@ -import {Component, View, bootstrap} from 'angular2/angular2' +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {IONIC_DIRECTIVES} from 'ionic/ionic' -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [FormDirectives].concat(IONIC_DIRECTIVES) @@ -21,4 +24,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/content/content.js b/ionic/components/content/content.js index dbb1a3db12..0cdd0a84e1 100644 --- a/ionic/components/content/content.js +++ b/ionic/components/content/content.js @@ -1,8 +1,6 @@ -import { - NgElement, - Component, - View, -} from 'angular2/angular2'; +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + @Component({ selector: 'ion-content', diff --git a/ionic/components/content/test/basic/main.js b/ionic/components/content/test/basic/index.js similarity index 57% rename from ionic/components/content/test/basic/main.js rename to ionic/components/content/test/basic/index.js index 7bd890f05e..e080c0eeee 100644 --- a/ionic/components/content/test/basic/main.js +++ b/ionic/components/content/test/basic/index.js @@ -1,10 +1,13 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Content} from 'ionic/components/content/content'; import {Icon} from 'ionic/components/icon/icon'; import {Checkbox} from 'ionic/components/checkbox/checkbox'; import {List} from 'ionic/components/list/list'; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Content, Icon, Checkbox, List] @@ -15,4 +18,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/content/test/pull-to-refresh/main.js b/ionic/components/content/test/pull-to-refresh/index.js similarity index 87% rename from ionic/components/content/test/pull-to-refresh/main.js rename to ionic/components/content/test/pull-to-refresh/index.js index 4167073fa1..7b78e35250 100644 --- a/ionic/components/content/test/pull-to-refresh/main.js +++ b/ionic/components/content/test/pull-to-refresh/index.js @@ -5,7 +5,7 @@ import {Checkbox} from 'ionic/components/checkbox/checkbox'; import {List} from 'ionic/components/list/list'; import {Refresher} from 'ionic/components/scroll/pull-to-refresh'; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Content, Icon, Checkbox, List, Refresher] @@ -22,4 +22,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/form/input/input.js b/ionic/components/form/input/input.js index 0187b04407..eb6aebd0f1 100644 --- a/ionic/components/form/input/input.js +++ b/ionic/components/form/input/input.js @@ -1,17 +1,16 @@ -import {NgElement, Decorator} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; + import {IonicComponent} from 'ionic/config/component' -@Decorator({ + +@Directive({ selector: 'ion-input' }) export class Input { - constructor( - @NgElement() ngElement:NgElement - ) { - this.domElement = ngElement.domElement + constructor() { //this.config = Button.config.invoke(this) console.log('INPUT'); } } -new IonicComponent(Input, { -}) +// new IonicComponent(Input, { +// }) diff --git a/ionic/components/form/label/label.js b/ionic/components/form/label/label.js index f3149743bf..7e779c0985 100644 --- a/ionic/components/form/label/label.js +++ b/ionic/components/form/label/label.js @@ -1,15 +1,14 @@ -import {NgElement, Decorator} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; + import {IonicComponent} from 'ionic/config/component' -@Decorator({ + +@Directive({ selector: 'ion-label' }) export class Label { - constructor( - @NgElement() ngElement:NgElement - ) { - this.domElement = ngElement.domElement + constructor() { } } -new IonicComponent(Label, { -}) +// new IonicComponent(Label, { +// }) diff --git a/ionic/components/form/test/basic/main.js b/ionic/components/form/test/basic/index.js similarity index 71% rename from ionic/components/form/test/basic/main.js rename to ionic/components/form/test/basic/index.js index cb6daaf61d..3f1f496375 100644 --- a/ionic/components/form/test/basic/main.js +++ b/ionic/components/form/test/basic/index.js @@ -1,11 +1,14 @@ -import {Component, View, bootstrap} from 'angular2/angular2' +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; //import {Button, Switch, Form, List, Label, Item, Input, Content} from 'ionic/ionic'; import {IONIC_DIRECTIVES} from 'ionic/ionic' console.log([FormDirectives].concat(IONIC_DIRECTIVES)); -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [FormDirectives].concat(IONIC_DIRECTIVES) @@ -26,4 +29,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/icon/icon.js b/ionic/components/icon/icon.js index 07f5b273a3..f695c376ec 100644 --- a/ionic/components/icon/icon.js +++ b/ionic/components/icon/icon.js @@ -1,10 +1,11 @@ -import {NgElement, Decorator} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; -@Decorator({ + +@Directive({ selector: 'ion-icon,ionicon,icon' }) export class Icon { - constructor(@NgElement() ngEle:NgElement) { - ngEle.domElement.setAttribute('aria-hidden', 'hidden') + constructor() { + //ngEle.domElement.setAttribute('aria-hidden', 'hidden') } } diff --git a/ionic/components/item/test/basic/main.js b/ionic/components/item/test/accessories/index.js similarity index 80% rename from ionic/components/item/test/basic/main.js rename to ionic/components/item/test/accessories/index.js index 4befaff65e..c7e3dea8ea 100644 --- a/ionic/components/item/test/basic/main.js +++ b/ionic/components/item/test/accessories/index.js @@ -4,16 +4,18 @@ import {Item, List} from 'ionic/ionic' import {ItemPrimarySwipeButtons} from 'ionic/components/item/item-swipe-buttons' @Component({ - selector: '[ion-app]' + selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Item, List, For, ItemPrimarySwipeButtons] }) -class App{ +class IonicApp { constructor() { this.items = [1, 2, 3, 4, 5] } } -bootstrap(App) +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/item/test/accessories/main.js b/ionic/components/item/test/basic/index.js similarity index 50% rename from ionic/components/item/test/accessories/main.js rename to ionic/components/item/test/basic/index.js index 4befaff65e..d5a513ae80 100644 --- a/ionic/components/item/test/accessories/main.js +++ b/ionic/components/item/test/basic/index.js @@ -1,19 +1,25 @@ -import {Component, View, For, bootstrap} from 'angular2/angular2' +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Item, List} from 'ionic/ionic' import {ItemPrimarySwipeButtons} from 'ionic/components/item/item-swipe-buttons' @Component({ - selector: '[ion-app]' + selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Item, List, For, ItemPrimarySwipeButtons] }) -class App{ +class IonicApp { constructor() { this.items = [1, 2, 3, 4, 5] } } -bootstrap(App) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/layout/test/basic/index.js b/ionic/components/layout/test/basic/index.js new file mode 100644 index 0000000000..79cce2dace --- /dev/null +++ b/ionic/components/layout/test/basic/index.js @@ -0,0 +1,23 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Content} from 'ionic/components/content/content'; +import {Layout} from 'ionic/components/layout/layout'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Content, Layout] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/layout/test/basic/main.js b/ionic/components/layout/test/basic/main.js deleted file mode 100644 index 6530cfb7f7..0000000000 --- a/ionic/components/layout/test/basic/main.js +++ /dev/null @@ -1,17 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; -import {Content} from 'ionic/components/content/content'; -import {Layout} from 'ionic/components/layout/layout'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Content, Layout] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/list/list.js b/ionic/components/list/list.js index 6b9531487f..976b3a7fe3 100644 --- a/ionic/components/list/list.js +++ b/ionic/components/list/list.js @@ -1,4 +1,6 @@ -import {NgElement, Component, View} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {IonicComponent} from 'ionic/config/component' @@ -9,14 +11,11 @@ import {IonicComponent} from 'ionic/config/component' template: `` }) export class List { - constructor( - ngElement: NgElement - ) { - this.domElement = ngElement.domElement; - this.config = List.config.invoke(this) + constructor() { + } } -new IonicComponent(List, { - propClasses: ['inset'] -}) +// new IonicComponent(List, { +// propClasses: ['inset'] +// }) diff --git a/ionic/components/list/test/basic/main.js b/ionic/components/list/test/basic/index.js similarity index 52% rename from ionic/components/list/test/basic/main.js rename to ionic/components/list/test/basic/index.js index cf865ab0a1..4189810213 100644 --- a/ionic/components/list/test/basic/main.js +++ b/ionic/components/list/test/basic/index.js @@ -1,10 +1,13 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Content} from 'ionic/components/content/content'; import {List} from 'ionic/components/list/list'; import {Item} from 'ionic/components/item/item'; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Content, List, Item] @@ -15,4 +18,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/nav/test/basic/main.js b/ionic/components/nav/test/basic/index.js similarity index 90% rename from ionic/components/nav/test/basic/main.js rename to ionic/components/nav/test/basic/index.js index 668f95e0f5..d714fe4226 100644 --- a/ionic/components/nav/test/basic/main.js +++ b/ionic/components/nav/test/basic/index.js @@ -1,11 +1,11 @@ import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Nav} from 'ionic/components/nav/nav' import {Log} from 'ionic/util' import {FirstPage} from './pages/first-page' -import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; -import {View} from 'angular2/src/core/annotations_impl/view'; - @Component({ selector: 'ion-app' }) @View({ @@ -17,4 +17,6 @@ class IonicApp { } } -bootstrap(IonicApp); +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/radio/test/basic/main.js b/ionic/components/radio/test/basic/index.js similarity index 58% rename from ionic/components/radio/test/basic/main.js rename to ionic/components/radio/test/basic/index.js index b93f68bd65..951b8c5bd0 100644 --- a/ionic/components/radio/test/basic/main.js +++ b/ionic/components/radio/test/basic/index.js @@ -1,11 +1,14 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Content} from 'ionic/components/content/content'; import {Icon} from 'ionic/components/icon/icon'; import {RadioGroup} from 'ionic/components/radio/radio-group'; import {RadioButton} from 'ionic/components/radio/radio-button'; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Content, RadioGroup, RadioButton] @@ -16,4 +19,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/scroll/pull-to-refresh.js b/ionic/components/scroll/pull-to-refresh.js index 7ca4a8ba0d..61d196af81 100644 --- a/ionic/components/scroll/pull-to-refresh.js +++ b/ionic/components/scroll/pull-to-refresh.js @@ -1,6 +1,9 @@ -import {NgElement, EventEmitter, Decorator, Component, View, PropertySetter} from 'angular2/angular2'; +import {NgElement, EventEmitter, PropertySetter} from 'angular2/angular2'; -@Decorator({ +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; + + +@Directive({ selector: '[ion-refresher]' }) export class Refresher { diff --git a/ionic/components/search-bar/test/basic/main.js b/ionic/components/search-bar/test/basic/index.js similarity index 54% rename from ionic/components/search-bar/test/basic/main.js rename to ionic/components/search-bar/test/basic/index.js index 250007b10a..a79f80ff16 100644 --- a/ionic/components/search-bar/test/basic/main.js +++ b/ionic/components/search-bar/test/basic/index.js @@ -1,10 +1,13 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Content} from 'ionic/components/content/content'; import {List} from 'ionic/components/list/list'; import {SearchBar} from 'ionic/components/search-bar/search-bar'; -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Content, List, SearchBar] @@ -15,4 +18,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/segment/test/basic/main.js b/ionic/components/segment/test/basic/index.js similarity index 63% rename from ionic/components/segment/test/basic/main.js rename to ionic/components/segment/test/basic/index.js index 7bff117e52..d1712273d4 100644 --- a/ionic/components/segment/test/basic/main.js +++ b/ionic/components/segment/test/basic/index.js @@ -1,8 +1,11 @@ -import {Component, View, bootstrap} from 'angular2/angular2' +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {IONIC_DIRECTIVES} from 'ionic/ionic' -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [FormDirectives].concat(IONIC_DIRECTIVES) @@ -22,4 +25,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/switch/switch.js b/ionic/components/switch/switch.js index a1401e8e13..0fa3c589b7 100644 --- a/ionic/components/switch/switch.js +++ b/ionic/components/switch/switch.js @@ -1,4 +1,7 @@ -import {NgElement, Renderer, ElementRef, Component, DefaultValueAccessor, View, Ancestor, Optional, Decorator, Directive} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {NgElement, Renderer, ElementRef, DefaultValueAccessor, Ancestor, Optional} from 'angular2/angular2' import {ControlGroup, ControlDirective} from 'angular2/forms' import {dom} from 'ionic/util'; import {IonicComponent} from 'ionic/config/component' diff --git a/ionic/components/switch/test/basic/main.js b/ionic/components/switch/test/basic/index.js similarity index 67% rename from ionic/components/switch/test/basic/main.js rename to ionic/components/switch/test/basic/index.js index 73c8840c6e..930daf59ba 100644 --- a/ionic/components/switch/test/basic/main.js +++ b/ionic/components/switch/test/basic/index.js @@ -1,8 +1,11 @@ -import {Component, View, bootstrap} from 'angular2/angular2' +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {IONIC_DIRECTIVES} from 'ionic/ionic' -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [FormDirectives].concat(IONIC_DIRECTIVES) @@ -24,4 +27,7 @@ class IonicApp { } } -bootstrap(IonicApp) + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/tabs/test/advanced/index.js b/ionic/components/tabs/test/advanced/index.js new file mode 100644 index 0000000000..36a61dda45 --- /dev/null +++ b/ionic/components/tabs/test/advanced/index.js @@ -0,0 +1,24 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Nav} from 'ionic/ionic' +import {SignInPage} from './pages/sign-in' + + +@Component({ + selector: 'ion-app', +}) +@View({ + templateUrl: 'main.html', + directives: [Nav] +}) +class IonicApp { + constructor() { + this.initial = SignInPage + } +} + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/tabs/test/advanced/main.js b/ionic/components/tabs/test/advanced/main.js deleted file mode 100644 index c682fcc6fa..0000000000 --- a/ionic/components/tabs/test/advanced/main.js +++ /dev/null @@ -1,18 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2' -import {Nav} from 'ionic/ionic' -import {SignInPage} from 'pages/sign-in' - - -@Component({ - selector: '[ion-app]', -}) -@View({ - templateUrl: 'main.html', - directives: [Nav] -}) -class App { - constructor() { - this.initial = SignInPage - } -} -bootstrap(App) diff --git a/ionic/components/tabs/test/advanced/pages/sign-in.js b/ionic/components/tabs/test/advanced/pages/sign-in.js index 6b217b63eb..0871f72a98 100644 --- a/ionic/components/tabs/test/advanced/pages/sign-in.js +++ b/ionic/components/tabs/test/advanced/pages/sign-in.js @@ -10,11 +10,11 @@ import { Toolbar, ToolbarTitle, } from 'ionic/ionic'; -import {TabsPage} from 'pages/tabs'; +import {TabsPage} from './tabs'; @Component() @View({ - templateUrl: 'pages/sign-in.html', + templateUrl: './pages/sign-in.html', directives: [Content, Toolbar, ToolbarTitle] }) export class SignInPage { diff --git a/ionic/components/tabs/test/advanced/pages/tabs.js b/ionic/components/tabs/test/advanced/pages/tabs.js index d6e476c5c7..a703a1fdbc 100644 --- a/ionic/components/tabs/test/advanced/pages/tabs.js +++ b/ionic/components/tabs/test/advanced/pages/tabs.js @@ -16,7 +16,7 @@ import {Toolbar, ToolbarTitle} from 'ionic/components/toolbar/toolbar'; selector: 'tabs-page' }) @View({ - templateUrl: 'pages/tabs.html', + templateUrl: './pages/tabs.html', directives: [Tabs, Tab, Content] }) diff --git a/ionic/components/tabs/test/basic/main.js b/ionic/components/tabs/test/basic/index.js similarity index 68% rename from ionic/components/tabs/test/basic/main.js rename to ionic/components/tabs/test/basic/index.js index fcbc580b17..a2feee7115 100644 --- a/ionic/components/tabs/test/basic/main.js +++ b/ionic/components/tabs/test/basic/index.js @@ -1,10 +1,13 @@ -import {Component, View, bootstrap} from 'angular2/angular2' +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + import {Tabs, Tab} from 'ionic/ionic' import {Engine} from 'ionic/engine/engine' import * as util from 'ionic/util' -@Component({ selector: '[ion-app]' }) +@Component({ selector: 'ion-app' }) @View({ templateUrl: 'main.html', directives: [Tabs, Tab] @@ -30,4 +33,7 @@ class IonicApp { } } -bootstrap(IonicApp); + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/tabs/test/tab-bar-bottom/index.js b/ionic/components/tabs/test/tab-bar-bottom/index.js new file mode 100644 index 0000000000..98ada0660f --- /dev/null +++ b/ionic/components/tabs/test/tab-bar-bottom/index.js @@ -0,0 +1,22 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Tabs, Tab} from 'ionic/ionic'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Tabs, Tab] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/tabs/test/tab-bar-bottom/main.js b/ionic/components/tabs/test/tab-bar-bottom/main.js deleted file mode 100644 index 9071db8ac0..0000000000 --- a/ionic/components/tabs/test/tab-bar-bottom/main.js +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; -import {Tabs, Tab} from 'ionic/ionic'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Tabs, Tab] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/tabs/test/tab-bar-icons/index.js b/ionic/components/tabs/test/tab-bar-icons/index.js new file mode 100644 index 0000000000..9b06881d63 --- /dev/null +++ b/ionic/components/tabs/test/tab-bar-icons/index.js @@ -0,0 +1,19 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html' +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/tabs/test/tab-bar-icons/main.js b/ionic/components/tabs/test/tab-bar-icons/main.js deleted file mode 100644 index 5614d29961..0000000000 --- a/ionic/components/tabs/test/tab-bar-icons/main.js +++ /dev/null @@ -1,14 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html' -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/tabs/test/tab-bar-top/index.js b/ionic/components/tabs/test/tab-bar-top/index.js new file mode 100644 index 0000000000..98ada0660f --- /dev/null +++ b/ionic/components/tabs/test/tab-bar-top/index.js @@ -0,0 +1,22 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + +import {Tabs, Tab} from 'ionic/ionic'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [Tabs, Tab] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/tabs/test/tab-bar-top/main.js b/ionic/components/tabs/test/tab-bar-top/main.js deleted file mode 100644 index 9071db8ac0..0000000000 --- a/ionic/components/tabs/test/tab-bar-top/main.js +++ /dev/null @@ -1,16 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; -import {Tabs, Tab} from 'ionic/ionic'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [Tabs, Tab] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/toolbar/test/html-title/index.js b/ionic/components/toolbar/test/html-title/index.js new file mode 100644 index 0000000000..13a7c97245 --- /dev/null +++ b/ionic/components/toolbar/test/html-title/index.js @@ -0,0 +1,20 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/toolbar/test/html-title/main.js b/ionic/components/toolbar/test/html-title/main.js deleted file mode 100644 index 7250607532..0000000000 --- a/ionic/components/toolbar/test/html-title/main.js +++ /dev/null @@ -1,15 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/toolbar/test/long-title/index.js b/ionic/components/toolbar/test/long-title/index.js new file mode 100644 index 0000000000..13a7c97245 --- /dev/null +++ b/ionic/components/toolbar/test/long-title/index.js @@ -0,0 +1,20 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/toolbar/test/long-title/main.js b/ionic/components/toolbar/test/long-title/main.js deleted file mode 100644 index 7250607532..0000000000 --- a/ionic/components/toolbar/test/long-title/main.js +++ /dev/null @@ -1,15 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/ionic/components/toolbar/test/lopsided-buttons/index.js b/ionic/components/toolbar/test/lopsided-buttons/index.js new file mode 100644 index 0000000000..13a7c97245 --- /dev/null +++ b/ionic/components/toolbar/test/lopsided-buttons/index.js @@ -0,0 +1,20 @@ +import {bootstrap} from 'angular2/angular2' +import {Component, Directive} from 'angular2/src/core/annotations_impl/annotations'; +import {View} from 'angular2/src/core/annotations_impl/view'; + + +@Component({ selector: 'ion-app' }) +@View({ + templateUrl: 'main.html', + directives: [] +}) +class IonicApp { + constructor() { + console.log('IonicApp Start') + } +} + + +export function main() { + bootstrap(IonicApp); +} diff --git a/ionic/components/toolbar/test/lopsided-buttons/main.js b/ionic/components/toolbar/test/lopsided-buttons/main.js deleted file mode 100644 index 7250607532..0000000000 --- a/ionic/components/toolbar/test/lopsided-buttons/main.js +++ /dev/null @@ -1,15 +0,0 @@ -import {Component, View, bootstrap} from 'angular2/angular2'; - - -@Component({ selector: '[ion-app]' }) -@View({ - templateUrl: 'main.html', - directives: [] -}) -class IonicApp { - constructor() { - console.log('IonicApp Start') - } -} - -bootstrap(IonicApp) diff --git a/package.json b/package.json index 73232975a0..fe97b906b5 100644 --- a/package.json +++ b/package.json @@ -17,6 +17,7 @@ "gulp-sass": "^1.3.3", "gulp-shell": "^0.4.0", "gulp-traceur": "^0.17.1", + "gulp-watch": "^4.2.4", "gulp-wrap": "^0.11.0", "karma": "^0.12.31", "karma-chrome-launcher": "^0.1.7", diff --git a/scripts/e2e/angular.template.html b/scripts/e2e/angular.template.html index d533b86650..4539beb8d0 100644 --- a/scripts/e2e/angular.template.html +++ b/scripts/e2e/angular.template.html @@ -4,25 +4,13 @@ - + Loading... + + $SCRIPTS$ + - - - - - - - - - - - - -