javascript/ionic-framework
1
0
Fork 0
mirror of https://github.com/ionic-team/ionic-framework.git synced 2026-03-13 10:22:08 +08:00
Code Issues Packages Projects Releases Wiki Activity

cleanup stuff

Browse Source
This commit is contained in:
Adam Bradley
2015-06-10 09:50:00 -05:00
parent 053c4ce238
commit 4f26e65691
6 changed files with 15 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/nav/nav.js
View File

@@ -1,7 +1,5 @@
import {Component, Directive, onInit} from 'angular2/src/core/annotations_impl/annotations';
import {View} from 'angular2/src/core/annotations_impl/view';
import {Directive, onInit} from 'angular2/src/core/annotations_impl/annotations';
import {Optional} from 'angular2/src/di/annotations_impl';
import {Parent} from 'angular2/src/core/annotations_impl/visibility';
import {Compiler} from 'angular2/angular2';
import {ElementRef} from 'angular2/src/core/compiler/element_ref';
import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';

3
ionic/components/nav/test/basic/pages/second-page.js
View File

@@ -16,8 +16,7 @@ import {ThirdPage} from './third-page';
<p>
<button class="button" (click)="push()">Push (Go to 3rd)</button>
</p>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
<div class="green"><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f></div>
</ion-content>
`,
directives: [NavbarTemplate, Navbar, Content]

3
ionic/components/nav/test/basic/pages/third-page.js
View File

@@ -12,8 +12,7 @@ import {NavController, NavbarTemplate, Navbar, Content} from 'ionic/ionic';
<p>
<button class="button" (click)="pop()">Pop (Go back to 2nd)</button>
</p>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>
<div class="yellow"><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f></div>
</ion-content>
`,
directives: [NavbarTemplate, Navbar, Content]

9
ionic/components/view/view-controller.js
View File

@@ -1,18 +1,11 @@
import {Parent} from 'angular2/src/core/annotations_impl/visibility';
import {Component, Directive, onInit} from 'angular2/src/core/annotations_impl/annotations';
import {Optional} from 'angular2/src/di/annotations_impl'
import {View} from 'angular2/src/core/annotations_impl/view';
import {Compiler} from 'angular2/angular2';
import {ElementRef} from 'angular2/src/core/compiler/element_ref';
import {DynamicComponentLoader} from 'angular2/src/core/compiler/dynamic_component_loader';
import {Injector} from 'angular2/di';
import {ViewContainerRef} from 'angular2/src/core/compiler/view_container_ref';
import {Compiler} from 'angular2/angular2';
import {bind} from 'angular2/di';
import {ViewItem} from './view-item';
import {NavController} from '../nav/nav-controller';
import {PaneController} from '../nav/pane';
import {NavParams} from '../nav/nav-params';
import {Transition} from '../../transitions/transition';
import {ClickBlock} from '../../util/click-block';
import * as util from 'ionic/util';

2
ionic/components/view/view-item.js
View File

@@ -47,7 +47,6 @@ export class ViewItem {
// figure out the sturcture of this Component
// does it have a navbar? Is it tabs? Should it not have a navbar or any toolbars?
let itemStructure = this.sturcture = this.getProtoViewStructure(componentProtoViewRef);
console.log('Pane itemStructure', itemStructure.key);
// get the appropriate Pane which this ViewItem will fit into
viewCtrl.panes.get(itemStructure, pane => {
@@ -138,7 +137,6 @@ export class ViewItem {
}
});
});
console.log('getProtoViewStructure')
if (this.viewCtrl.parentNavbar()) {
navbar = false;

16
scripts/e2e/angular.template.html
View File

@@ -11,19 +11,25 @@
/* hack to create tall scrollable areas for testing using <f></f> */
f {
display: block;
margin: 10px auto;
max-width: 200px;
height: 200px;
margin: 15px auto;
max-width: 150px;
height: 150px;
background: blue;
}
f:last-of-type {
background: red;
}
ion-tab:nth-of-type(2) f {
ion-tab:nth-of-type(2) f,
.green f {
background: green;
max-width: 250px;
height: 100px;
}
ion-tab:nth-of-type(3) f {
ion-tab:nth-of-type(3) f,
.yellow f {
background: yellow;
width: 100px;
height: 50px;
}
</style>
</head>