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

Rollback raw thing

Browse Source
This commit is contained in:
Max Lynch
2015-05-04 16:05:55 -05:00
parent 29c94bb403
commit f314d44b90
3 changed files with 16 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
ionic/components/app/test/barkpark/main.js
View File

@ -2,14 +2,15 @@
import {For, Component, View, Parent, bootstrap} from 'angular2/angular2' import {For, Component, View, Parent, bootstrap} from 'angular2/angular2'
import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms'; import {FormBuilder, Validators, FormDirectives, ControlGroup} from 'angular2/forms';
import {Log} from 'ionic/util' import {Log} from 'ionic/util'
import {Router, List, Item, Nav ,NavController, Button, Input, Tabs, Tab, Content, Aside} from 'ionic/ionic' import {Router, List, Item, Nav, NavController, Toolbar, ToolbarTitle,
Button, Input, Tabs, Tab, Content, Aside} from 'ionic/ionic'
@Component({ @Component({
selector: 'login-page' selector: 'login-page'
}) })
@View({ @View({
templateUrl: 'pages/login.html', templateUrl: 'pages/login.html',
directives: [FormDirectives, Button, Input] directives: [FormDirectives, Button, Input, Content, Toolbar, ToolbarTitle]
}) })
export class LoginPage { export class LoginPage {
constructor( @Parent() viewport: NavController ) { //, fb: FormBuilder ) { constructor( @Parent() viewport: NavController ) { //, fb: FormBuilder ) {

9
ionic/components/app/test/barkpark/pages/login.html
View File

@ -1,4 +1,9 @@
<div> <header *ion-toolbar>
<h1 class="toolbar-title">
Login
</h1>
</header>
<ion-content class="padding">
<form (^submit)="doLogin($event)" [control-group]="loginForm"> <form (^submit)="doLogin($event)" [control-group]="loginForm">
<ion-input> <ion-input>
<input control="email" type="email" placeholder="Your email"> <input control="email" type="email" placeholder="Your email">
@ -11,4 +16,4 @@
<button ion-button primary block (click)="doSignup()">Create an account</button> <button ion-button primary block (click)="doSignup()">Create an account</button>
</div> </div>
</form> </form>
</div> </ion-content>

9
ionic/config/component.js
View File

@ -59,12 +59,15 @@ export class IonicComponent {
} }
} }
// TODO: This worked fine for property-only buttons, but breaks with
// class, etc.
//
// If we want to enhance a raw element (for example, a button), // If we want to enhance a raw element (for example, a button),
// only do it if we also have a matching prop class // only do it if we also have a matching prop class
if(!foundMatchingPropClass && this.enhanceRawElement) { //if(!foundMatchingPropClass && this.enhanceRawElement) {
// Don't enhace this raw element // Don't enhace this raw element
return; //return;
} //}
// Add the base element classes (ex, button and button-ios) // Add the base element classes (ex, button and button-ios)
dom.addClasses(instance.domElement, this.componentCssName, `${this.componentCssName}-${platformMode}`); dom.addClasses(instance.domElement, this.componentCssName, `${this.componentCssName}-${platformMode}`);