Merge branch '2.0' into windows-mode

This commit is contained in:
Brandy Carney
2016-02-22 20:38:50 -05:00
107 changed files with 129 additions and 121 deletions

View File

@ -1,4 +1,4 @@
import {App, Page, ActionSheet, NavController} from '../../../../../ionic/ionic'; import {App, Page, ActionSheet, NavController} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page, Alert, Modal, NavController, ViewController} from '../../../../../ionic/ionic'; import {App, Page, Alert, Modal, NavController, ViewController} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page, Animation, IonicApp} from '../../../../../ionic/ionic'; import {App, Page, Animation, IonicApp} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,7 +1,7 @@
import {Component} from 'angular2/core'; import {Component} from 'angular2/core';
import {Control, ControlGroup} from 'angular2/common'; import {Control, ControlGroup} from 'angular2/common';
import {App, Storage, LocalStorage, SqlStorage} from '../../../../../ionic/ionic'; import {App, Storage, LocalStorage, SqlStorage} from 'ionic-angular';
@App({ @App({
templateUrl: 'main.html' templateUrl: 'main.html'

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {Button, Config} from '../../../../ionic/ionic'; import {Button, Config} from 'ionic-angular';
export function run() { export function run() {

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
import { import {
Control, Control,
ControlGroup, ControlGroup,

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
import {FormBuilder, Validators} from 'angular2/common'; import {FormBuilder, Validators} from 'angular2/common';

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {TextInput} from '../../../../ionic/ionic'; import {TextInput} from 'ionic-angular';
export function run() { export function run() {

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController, NavParams} from '../../../../../ionic/ionic'; import {App, Page, NavController, NavParams} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from 'ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, Page, IonicApp, Alert, NavController} from '../../../../../ionic/ionic'; import {App, Page, IonicApp, Alert, NavController} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -46,7 +46,7 @@ import {MenuType} from './menu-types';
* without requiring a menu ID. * without requiring a menu ID.
* *
* ```ts * ```ts
* import{Page, MenuController} from 'ionic/ionic'; * import{Page, MenuController} from 'ionic-angular';
* @Page({...}) * @Page({...})
* export class MyPage { * export class MyPage {
* constructor(menu: MenuController) { * constructor(menu: MenuController) {

View File

@ -1,4 +1,4 @@
import {App, IonicApp, MenuController, Page, NavController, Alert} from '../../../../../ionic/ionic'; import {App, IonicApp, MenuController, Page, NavController, Alert} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController, MenuController} from '../../../../../ionic/ionic'; import {App, Page, NavController, MenuController} from 'ionic-angular';
@Page({ @Page({
templateUrl: 'page1.html' templateUrl: 'page1.html'

View File

@ -1,4 +1,4 @@
import {App, Page, IonicApp, MenuController} from '../../../../../ionic/ionic'; import {App, Page, IonicApp, MenuController} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {MenuController, Menu} from '../../../../ionic/ionic'; import {MenuController, Menu} from 'ionic-angular';
export function run() { export function run() {
describe('MenuController', () => { describe('MenuController', () => {

View File

@ -1,4 +1,4 @@
import {App, Page, MenuController} from '../../../../../ionic/ionic'; import {App, Page, MenuController} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, IonicApp, Page} from '../../../../../ionic/ionic'; import {App, IonicApp, Page} from 'ionic-angular';
@Page({templateUrl: 'page1.html'}) @Page({templateUrl: 'page1.html'})

View File

@ -1,4 +1,4 @@
import {App, IonicApp, Page} from '../../../../../ionic/ionic'; import {App, IonicApp, Page} from 'ionic-angular';
@Page({templateUrl: 'page1.html'}) @Page({templateUrl: 'page1.html'})

View File

@ -1,4 +1,4 @@
import {App, IonicApp, Page} from '../../../../../ionic/ionic'; import {App, IonicApp, Page} from 'ionic-angular';
@Page({templateUrl: 'page1.html'}) @Page({templateUrl: 'page1.html'})

View File

@ -28,7 +28,7 @@ import {Transition, TransitionOptions} from '../../transitions/transition';
* *
* @usage * @usage
* ```ts * ```ts
* import {Page, Modal, NavController, NavParams} from 'ionic/ionic'; * import {Page, Modal, NavController, NavParams} from 'ionic-angular';
* *
* @Page(...) * @Page(...)
* class HomePage { * class HomePage {
@ -60,7 +60,7 @@ import {Transition, TransitionOptions} from '../../transitions/transition';
* modal. * modal.
* *
* ```ts * ```ts
* import {Page, Modal, NavController} from 'ionic/ionic'; * import {Page, Modal, NavController} from 'ionic-angular';
* *
* @Page(...) * @Page(...)
* class HomePage { * class HomePage {

View File

@ -1,5 +1,5 @@
import {App, Page, Config, Platform} from '../../../../../ionic/ionic'; import {App, Page, Config, Platform} from 'ionic-angular';
import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from '../../../../../ionic/ionic';; import {Modal, ActionSheet, NavController, NavParams, Transition, TransitionOptions, ViewController} from 'ionic-angular';;
@Page({ @Page({

View File

@ -187,7 +187,7 @@ export class NavController extends Ion {
* *
* *
*```typescript *```typescript
* import {Page, NavController} from 'ionic/ionic' * import {Page, NavController} from 'ionic-angular'
* import {Detail} from '../detail/detail' * import {Detail} from '../detail/detail'
* import {Info} from '../info/info' * import {Info} from '../info/info'
* *
@ -208,7 +208,7 @@ export class NavController extends Ion {
* *
* *
*```typescript *```typescript
* import {Page, NavController} from 'ionic/ionic' * import {Page, NavController} from 'ionic-angular'
* import {Detail} from '../detail/detail' * import {Detail} from '../detail/detail'
* *
* export class Home { * export class Home {
@ -228,7 +228,7 @@ export class NavController extends Ion {
* *
* *
*```typescript *```typescript
* import {Page, NavController} from 'ionic/ionic'; * import {Page, NavController} from 'ionic-angular';
* import {Info} from '../info/info'; * import {Info} from '../info/info';
* import {List} from '../list/list'; * import {List} from '../list/list';
* import {Detail} from '../detail/detail'; * import {Detail} from '../detail/detail';

View File

@ -1,7 +1,7 @@
import {Component, Type} from 'angular2/core'; import {Component, Type} from 'angular2/core';
import {App, NavController, Alert} from '../../../../../ionic/ionic'; import {App, NavController, Alert} from 'ionic-angular';
import {Page, Config, IonicApp} from '../../../../../ionic/ionic'; import {Page, Config, IonicApp} from 'ionic-angular';
import {NavParams, ViewController, IONIC_DIRECTIVES} from '../../../../../ionic/ionic';; import {NavParams, ViewController, IONIC_DIRECTIVES} from 'ionic-angular';;
@Component({ @Component({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController} from '../../../../../ionic/ionic'; import {App, Page, NavController} from 'ionic-angular';

View File

@ -1,4 +1,4 @@
import {App, Page, NavController} from '../../../../../ionic/ionic'; import {App, Page, NavController} from 'ionic-angular';
let delay = 100; let delay = 100;

View File

@ -1,4 +1,4 @@
import {NavController, Tabs, NavOptions, Config, ViewController} from '../../../../ionic/ionic'; import {NavController, Tabs, NavOptions, Config, ViewController} from 'ionic-angular';
export function run() { export function run() {
describe('NavController', () => { describe('NavController', () => {

View File

@ -1,5 +1,5 @@
import {App, NavParams, NavController, ViewController, MenuController} from '../../../../../ionic/ionic'; import {App, NavParams, NavController, ViewController, MenuController} from 'ionic-angular';
import {Page, Config, IonicApp} from '../../../../../ionic/ionic'; import {Page, Config, IonicApp} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,6 +1,6 @@
import {RouteConfig, Location} from 'angular2/router'; import {RouteConfig, Location} from 'angular2/router';
import {App, Page, NavParams, ViewController} from '../../../../../ionic/ionic'; import {App, Page, NavParams, ViewController} from 'ionic-angular';
@Page({templateUrl: 'view1.html'}) @Page({templateUrl: 'view1.html'})

View File

@ -11,7 +11,7 @@ import {NavParams} from './nav-params';
* Access various features and information about the current view * Access various features and information about the current view
* @usage * @usage
* ```ts * ```ts
* import {Page, ViewController} from 'ionic/ionic'; * import {Page, ViewController} from 'ionic-angular';
* @Page.... * @Page....
* export class MyPage{ * export class MyPage{
* constructor(viewCtrl: ViewController){ * constructor(viewCtrl: ViewController){

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
import {Control, ControlGroup} from 'angular2/common'; import {Control, ControlGroup} from 'angular2/common';

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,6 +1,6 @@
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common'; import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({
templateUrl: 'main.html', templateUrl: 'main.html',

View File

@ -1,4 +1,4 @@
import {App, Page, NavController} from '../../../../../ionic/ionic'; import {App, Page, NavController} from 'ionic-angular';
@Page({ @Page({
templateUrl: 'first.html' templateUrl: 'first.html'

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({
templateUrl: 'main.html' templateUrl: 'main.html'

View File

@ -1,6 +1,6 @@
import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common'; import {FORM_DIRECTIVES, FormBuilder, Validators, Control, ControlGroup} from 'angular2/common';
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({

View File

@ -1,5 +1,5 @@
import {Validators, Control, ControlGroup} from 'angular2/common'; import {Validators, Control, ControlGroup} from 'angular2/common';
import {App, Page, NavController} from '../../../../../ionic/ionic'; import {App, Page, NavController} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,6 +1,6 @@
import {Validators, Control, ControlGroup} from 'angular2/common'; import {Validators, Control, ControlGroup} from 'angular2/common';
import {Http} from 'angular2/http'; import {Http} from 'angular2/http';
import {App, Page, IonicApp, NavController} from '../../../../../ionic/ionic'; import {App, Page, IonicApp, NavController} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App, Page} from '../../../../../ionic/ionic'; import {App, Page} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,6 +1,6 @@
import {NgFor} from 'angular2/common'; import {NgFor} from 'angular2/common';
import {App, Page} from '../../../../../ionic/ionic'; import {App, Page} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
import { import {
Control, Control,
ControlGroup, ControlGroup,

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
import {Http} from 'angular2/http'; import {Http} from 'angular2/http';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController} from 'ionic/ionic'; import {App, Page, NavController} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, IonicApp} from '../../../../../ionic/ionic'; import {App, IonicApp} from 'ionic-angular';
@App({ @App({
templateUrl: 'main.html' templateUrl: 'main.html'

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({
templateUrl: 'main.html', templateUrl: 'main.html',

View File

@ -1,7 +1,7 @@
import {ViewChild} from 'angular2/core'; import {ViewChild} from 'angular2/core';
import {RouteConfig, Location} from 'angular2/router'; import {RouteConfig, Location} from 'angular2/router';
import {App, Page, NavController, NavParams, Modal, ViewController, Tabs} from '../../../../../ionic/ionic'; import {App, Page, NavController, NavParams, Modal, ViewController, Tabs} from 'ionic-angular';
@Page({ @Page({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App, Page, NavController, Alert, Modal, ViewController} from '../../../../../ionic/ionic'; import {App, Page, NavController, Alert, Modal, ViewController} from 'ionic-angular';
// //
// Modal // Modal

View File

@ -1,4 +1,4 @@
import {App, Page, NavController, Tab} from '../../../../../ionic/ionic'; import {App, Page, NavController, Tab} from 'ionic-angular';
import {ContentChild, QueryList, ViewChildren} from 'angular2/core'; import {ContentChild, QueryList, ViewChildren} from 'angular2/core';

View File

@ -1,4 +1,4 @@
import {App, Page} from '../../../../../ionic/ionic'; import {App, Page} from 'ionic-angular';
@Page({template:'hi'}) @Page({template:'hi'})

View File

@ -1,4 +1,4 @@
import * as tapClick from '../../../../ionic/ionic'; import * as tapClick from 'ionic-angular';
export function run() { export function run() {

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
import { import {
Control, Control,
ControlGroup, ControlGroup,

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {App} from '../../../../../ionic/ionic'; import {App} from 'ionic-angular';
@App({ @App({

View File

@ -1,4 +1,4 @@
import {Config, Platform, ionicProviders} from '../../../ionic/ionic'; import {Config, Platform, ionicProviders} from 'ionic-angular';
export function run() { export function run() {

Some files were not shown because too many files have changed in this diff Show More