Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor(item): replaced attributes with item-start / item-end #11125

Merged
merged 10 commits into from
May 5, 2017
Merged

refactor(item): replaced attributes with item-start / item-end #11125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
cb5ac7c
refactor(item): replaced item-left with item-start
AmitMY Apr 7, 2017
4509c1f
style(item): fix spacing
AmitMY Apr 8, 2017
2172d11
fix(item): add backwards support for left/right in ng-content
AmitMY Apr 24, 2017
22d24a0
fix(item): deprecated old variables, not breaking change
AmitMY Apr 24, 2017
e1da67d
Merge remote-tracking branch 'origin/breaking-item' into breaking-item
AmitMY Apr 24, 2017
d103932
Merge branch 'master' into breaking-item
AmitMY Apr 24, 2017
bdafbf8
fix(scss): fix variable name
AmitMY Apr 24, 2017
0d4e5c1
fix(item): old attributes deprecated support
AmitMY Apr 27, 2017
df3f74e
revert(changelog): not intended to be changed
AmitMY Apr 27, 2017
02b6df9
Merge branch 'master' into breaking-item
AmitMY May 5, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions demos/src/item-sliding/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,12 @@

<ion-item-sliding *ngFor="let chat of chats" #item>
<ion-item>
<ion-avatar item-left>
<ion-avatar item-start>
<img [src]="chat.img">
</ion-avatar>
<h2>{{chat.name}}</h2>
<p>{{chat.message}}</p>
<ion-note item-right>
<ion-note item-end>
{{chat.time}}
</ion-note>
</ion-item>
Expand Down Expand Up @@ -58,7 +58,7 @@ <h2>{{chat.name}}</h2>

<ion-item-sliding *ngFor="let login of logins" #item>
<ion-item>
<ion-icon [name]="login.icon" item-left></ion-icon>
<ion-icon [name]="login.icon" item-start></ion-icon>
<h2>{{login.name}}</h2>
<p>{{login.username}}</p>
</ion-item>
Expand Down
38 changes: 19 additions & 19 deletions demos/src/item/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,51 +12,51 @@
<ion-list>
<ion-list-header>
Settings
<button ion-button icon-only item-right clear>
<button ion-button icon-only item-end clear>
<ion-icon name="cog"></ion-icon>
</button>
</ion-list-header>

<ion-item-group>
<ion-item>
<ion-icon name="plane" item-left color="danger"></ion-icon>
<ion-icon name="plane" item-start color="danger"></ion-icon>
<ion-label>Airplane Mode</ion-label>
<ion-toggle color="secondary"></ion-toggle>
</ion-item>

<button ion-item>
<ion-icon name="wifi" item-left color="primary"></ion-icon>
<ion-icon name="wifi" item-start color="primary"></ion-icon>
<ion-label>Wi-Fi</ion-label>
<ion-note item-right>The Interwebz</ion-note>
<ion-note item-end>The Interwebz</ion-note>
</button>

<button ion-item>
<ion-icon name="bluetooth" item-left color="primary"></ion-icon>
<ion-icon name="bluetooth" item-start color="primary"></ion-icon>
<ion-label>Bluetooth</ion-label>
<ion-note item-right>Off</ion-note>
<ion-note item-end>Off</ion-note>
</button>
</ion-item-group>

<ion-item-divider color="primary">
Other Settings
<button ion-button item-right outline color="light">Clear</button>
<button ion-button item-end outline color="light">Clear</button>
</ion-item-divider>

<button ion-item>
<ion-icon name="call" item-left color="secondary"></ion-icon>
<ion-icon name="call" item-start color="secondary"></ion-icon>
<ion-label>Cellular</ion-label>
</button>

<button ion-item>
<ion-icon name="link" item-left color="secondary"></ion-icon>
<ion-icon name="link" item-start color="secondary"></ion-icon>
<ion-label>Personal Hotspot</ion-label>
<ion-note item-right>Off</ion-note>
<ion-note item-end>Off</ion-note>
</button>
</ion-list>

<ion-list radio-group>
<ion-list-header>
<ion-icon item-left name="phone-portrait"></ion-icon>
<ion-icon item-start name="phone-portrait"></ion-icon>
Silence Phone
</ion-list-header>

Expand All @@ -76,24 +76,24 @@
</ion-list-header>

<ion-item>
<ion-icon name="ionic" item-left color="primary"></ion-icon>
<ion-icon name="ionic" item-start color="primary"></ion-icon>
<ion-label>Ionic View</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
<ion-item>
<ion-icon name="brush" item-left color="primary"></ion-icon>
<ion-icon name="brush" item-start color="primary"></ion-icon>
<ion-label>Ionic Creator</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
<ion-item>
<ion-icon name="logo-octocat" item-left color="dark"></ion-icon>
<ion-icon name="logo-octocat" item-start color="dark"></ion-icon>
<ion-label>Hubstruck</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
<ion-item>
<ion-icon name="paw" item-left color="danger"></ion-icon>
<ion-icon name="paw" item-start color="danger"></ion-icon>
<ion-label>Barkpark</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
</ion-list>

Expand Down
6 changes: 3 additions & 3 deletions demos/src/label/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ion-list>
<ion-item no-lines>
<ion-avatar item-left>
<ion-avatar item-start>
<img src="./assets/ionic.svg">
</ion-avatar>
<ion-label>Ionic</ion-label>
Expand All @@ -21,8 +21,8 @@
<ion-item>
<ion-label stacked color="primary">Mobile</ion-label>
<ion-input type="tel" value="+1 (555) 123-1234"></ion-input>
<ion-icon color="primary" item-right ios="ios-chatbubbles-outline" md="md-chatbubbles"></ion-icon>
<ion-icon color="primary" item-right ios="ios-call-outline" md="md-call"></ion-icon>
<ion-icon color="primary" item-end ios="ios-chatbubbles-outline" md="md-chatbubbles"></ion-icon>
<ion-icon color="primary" item-end ios="ios-call-outline" md="md-call"></ion-icon>
</ion-item>

<ion-item>
Expand Down
32 changes: 16 additions & 16 deletions demos/src/list/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,32 +15,32 @@
</ion-list-header>

<ion-item>
<ion-icon name="plane" item-left color="danger"></ion-icon>
<ion-icon name="plane" item-start color="danger"></ion-icon>
<ion-label>Airplane Mode</ion-label>
<ion-toggle color="secondary"></ion-toggle>
</ion-item>

<button ion-item>
<ion-icon name="wifi" item-left color="primary"></ion-icon>
<ion-icon name="wifi" item-start color="primary"></ion-icon>
<ion-label>Wi-Fi</ion-label>
<ion-note item-right>The Interwebz</ion-note>
<ion-note item-end>The Interwebz</ion-note>
</button>

<button ion-item>
<ion-icon name="bluetooth" item-left color="primary"></ion-icon>
<ion-icon name="bluetooth" item-start color="primary"></ion-icon>
<ion-label>Bluetooth</ion-label>
<ion-note item-right>Off</ion-note>
<ion-note item-end>Off</ion-note>
</button>

<button ion-item>
<ion-icon name="call" item-left color="secondary"></ion-icon>
<ion-icon name="call" item-start color="secondary"></ion-icon>
<ion-label>Cellular</ion-label>
</button>

<button ion-item>
<ion-icon name="link" item-left color="secondary"></ion-icon>
<ion-icon name="link" item-start color="secondary"></ion-icon>
<ion-label>Personal Hotspot</ion-label>
<ion-note item-right>Off</ion-note>
<ion-note item-end>Off</ion-note>
</button>
</ion-list>

Expand All @@ -65,24 +65,24 @@
</ion-list-header>

<ion-item>
<ion-icon name="ionic" item-left color="primary"></ion-icon>
<ion-icon name="ionic" item-start color="primary"></ion-icon>
<ion-label>Ionic View</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
<ion-item>
<ion-icon name="brush" item-left color="primary"></ion-icon>
<ion-icon name="brush" item-start color="primary"></ion-icon>
<ion-label>Ionic Creator</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
<ion-item>
<ion-icon name="logo-octocat" item-left color="dark"></ion-icon>
<ion-icon name="logo-octocat" item-start color="dark"></ion-icon>
<ion-label>Hubstruck</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
<ion-item>
<ion-icon name="paw" item-left color="danger"></ion-icon>
<ion-icon name="paw" item-start color="danger"></ion-icon>
<ion-label>Barkpark</ion-label>
<button ion-button outline item-right>Uninstall</button>
<button ion-button outline item-end>Uninstall</button>
</ion-item>
</ion-list>

Expand Down
12 changes: 6 additions & 6 deletions demos/src/loading/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,27 +14,27 @@
Spinner Loading Indicators
</ion-list-header>
<button ion-item (click)="presentLoadingIos()">
<ion-spinner item-left name="ios"></ion-spinner>
<ion-spinner item-start name="ios"></ion-spinner>
Show iOS
</button>
<button ion-item (click)="presentLoadingDots()">
<ion-spinner item-left name="dots"></ion-spinner>
<ion-spinner item-start name="dots"></ion-spinner>
Show Dots
</button>
<button ion-item (click)="presentLoadingBubbles()">
<ion-spinner item-left name="bubbles"></ion-spinner>
<ion-spinner item-start name="bubbles"></ion-spinner>
Show Bubbles
</button>
<button ion-item (click)="presentLoadingCircles()">
<ion-spinner item-left name="circles"></ion-spinner>
<ion-spinner item-start name="circles"></ion-spinner>
Show Circles
</button>
<button ion-item (click)="presentLoadingCrescent()">
<ion-spinner item-left name="crescent"></ion-spinner>
<ion-spinner item-start name="crescent"></ion-spinner>
Show Crescent
</button>
<button ion-item (click)="presentLoadingDefault()">
<ion-spinner item-left></ion-spinner>
<ion-spinner item-start></ion-spinner>
Show Default
</button>
</ion-list>
Expand Down
10 changes: 5 additions & 5 deletions demos/src/range/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<ion-list>
<ion-list-header>
Brightness
<ion-badge item-right>{{brightness}}</ion-badge>
<ion-badge item-end>{{brightness}}</ion-badge>
</ion-list-header>
<ion-item>
<ion-range [(ngModel)]="brightness">
Expand All @@ -25,7 +25,7 @@
<ion-list>
<ion-list-header>
Saturation
<ion-badge item-right color="secondary">{{saturation}}</ion-badge>
<ion-badge item-end color="secondary">{{saturation}}</ion-badge>
</ion-list-header>
<ion-item>
<ion-range min="-200" max="200" pin="true" [(ngModel)]="saturation" color="secondary">
Expand All @@ -38,7 +38,7 @@
<ion-list>
<ion-list-header>
Warmth
<ion-badge item-right color="danger">{{warmth}}</ion-badge>
<ion-badge item-end color="danger">{{warmth}}</ion-badge>
</ion-list-header>
<ion-item>
<ion-range min="1000" max="2000" step="100" snaps="true" [(ngModel)]="warmth" color="danger">
Expand All @@ -51,8 +51,8 @@
<ion-list>
<ion-list-header>
Structure
<ion-badge item-right color="dark">{{structure.lower}}</ion-badge>
<ion-badge item-right color="dark">{{structure.upper}}</ion-badge>
<ion-badge item-end color="dark">{{structure.lower}}</ion-badge>
<ion-badge item-end color="dark">{{structure.upper}}</ion-badge>
</ion-list-header>
<ion-item>
<ion-range dualKnobs="true" pin="true" [(ngModel)]="structure" (ionChange)="onChange($event)" color="dark">
Expand Down
4 changes: 2 additions & 2 deletions demos/src/segment/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
<ion-list-header>{{ appType }}</ion-list-header>
<ion-item *ngFor="let item of getItems(appType)">
{{ item.name }}
<button ion-button outline item-right>{{ item.price }}</button>
<button ion-button outline item-end>{{ item.price }}</button>
</ion-item>
</ion-list>

Expand All @@ -47,7 +47,7 @@
</ion-segment>
<ion-list style="margin: 0" inset>
<button ion-item *ngFor="let sItem of getSafariItems(safari)">
<ion-icon item-left [name]="sItem.icon" color="primary"></ion-icon>
<ion-icon item-start [name]="sItem.icon" color="primary"></ion-icon>
{{ sItem.name }}
</button>
</ion-list>
Expand Down
4 changes: 2 additions & 2 deletions src/components/app/test/gesture-collision/pages/page-one/page-one.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

<ion-item>
<ion-label>Apple</ion-label>
<ion-toggle item-left></ion-toggle>
<ion-toggle item-start></ion-toggle>
</ion-item>

<ion-item>
Expand Down Expand Up @@ -106,7 +106,7 @@

<ion-item>
<ion-label>Apple</ion-label>
<ion-toggle item-left></ion-toggle>
<ion-toggle item-start></ion-toggle>
</ion-item>

<ion-item>
Expand Down
2 changes: 1 addition & 1 deletion src/components/app/test/gesture-collision/pages/page-two/page-two.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ <h3>Page 1</h3>

<ion-item>
<ion-label>Apple</ion-label>
<ion-toggle item-left></ion-toggle>
<ion-toggle item-start></ion-toggle>
</ion-item>

<ion-item>
Expand Down
2 changes: 1 addition & 1 deletion src/components/avatar/avatar.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { Directive } from '@angular/core';
* @module ionic
* @description
* An Avatar is a component that creates a circular image for an item.
* Avatars can be placed on the left or right side of an item with the `item-left` or `item-right` directive.
* Avatars can be placed on the left or right side of an item with the `item-start` or `item-end` directive.
* @see {@link /docs/components/#avatar-list Avatar Component Docs}
*/
@Directive({
Expand Down
Loading