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

Merge remote-tracking branch 'origin/master' into WIP-api-demos

Browse Source
This commit is contained in:
Drew Rygh
2015-12-16 11:13:03 -06:00
parent adf62fdc41 364f9e12ae
commit 068f3ceb29
185 changed files with 2645 additions and 1828 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ionic/components/menu/menu-close.ts
View File

@@ -1,4 +1,4 @@
import {Directive} from 'angular2/angular2';
import {Directive} from 'angular2/core';
import {IonicApp} from '../app/app';
import {Menu} from './menu';
@@ -11,7 +11,7 @@ import {Menu} from './menu';
* @see {@link ../../menu/Menu Menu API Docs}
*/
@Directive({
selector: '[menu-close]',
selector: '[menuClose]',
inputs: [
'menuClose'
],

4
ionic/components/menu/menu-gestures.ts
View File

@@ -1,9 +1,9 @@
import {Menu} from './menu';
import {SlideEdgeGesture} from '../../gestures/slide-edge-gesture';
import * as util from 'ionic/util';
import * as util from '../../util';
class MenuContentGesture extends SlideEdgeGesture {
export class MenuContentGesture extends SlideEdgeGesture {
constructor(menu: Menu, targetEl: Element, options = {}) {
super(targetEl, util.extend({

8
ionic/components/menu/menu-toggle.ts
View File

@@ -1,4 +1,4 @@
import {Directive, ElementRef, Optional} from 'angular2/angular2';
import {Directive, ElementRef, Optional} from 'angular2/core';
import {IonicApp} from '../app/app';
import {ViewController} from '../nav/view-controller';
@@ -13,14 +13,14 @@ import {Menu} from './menu';
* @see {@link ../../menu/Menu Menu API Docs}
*/
@Directive({
selector: '[menu-toggle]',
selector: '[menuToggle]',
inputs: [
'menuToggle'
],
host: {
'(click)': 'toggle()',
'[hidden]': 'isHidden',
'menu-toggle': '' //ensures the attr is there for css when using [menu-toggle]
'menuToggle': '' //ensures the attr is there for css when using [menuToggle]
}
})
export class MenuToggle {
@@ -37,7 +37,7 @@ export class MenuToggle {
// Deprecation warning
if (this.withinNavbar && elementRef.nativeElement.tagName === 'A') {
console.warn('Menu toggles within a navbar should use <button menu-toggle> instead of <a toggle>')
console.warn('Menu toggles within a navbar should use <button menuToggle> instead of <a menu-toggle>')
}
}

2
ionic/components/menu/menu-types.ts
View File

@@ -1,5 +1,5 @@
import {Menu} from './menu';
import {Animation} from 'ionic/animations/animation';
import {Animation} from '../../animations/animation';
/**

15
ionic/components/menu/menu.ts
View File

@@ -1,4 +1,4 @@
import {Component, forwardRef, Directive, Host, EventEmitter, ElementRef} from 'angular2/angular2';
import {Component, forwardRef, Directive, Host, EventEmitter, ElementRef} from 'angular2/core';
import {Ion} from '../ion';
import {IonicApp} from '../app/app';
@@ -39,8 +39,8 @@ import * as gestures from './menu-gestures';
* to get ahold of menu references. If no `id` is given then the menu
* automatically receives an `id` created from the side it is on, such as
* `leftMenu` or `rightMenu`. When using more than one menu it is always
* recommended to give each menu a unique `id`. Additionally menu-toggle and
* menu-close directives should be given menu id values of their respective
* recommended to give each menu a unique `id`. Additionally menuToggle and
* menuClose directives should be given menu id values of their respective
* menu.
*
* Menu supports two display styles: overlay, and reveal. Overlay
@@ -62,7 +62,6 @@ import * as gestures from './menu-gestures';
selector: 'ion-menu',
inputs: [
'content',
'dragThreshold',
'id',
'side',
'type'
@@ -192,7 +191,7 @@ export class Menu extends Ion {
*/
setOpen(shouldOpen) {
// _isPrevented is used to prevent unwanted opening/closing after swiping open/close
// or swiping open the menu while pressing down on the menu-toggle button
// or swiping open the menu while pressing down on the menuToggle button
if (shouldOpen === this.isOpen || this._isPrevented()) {
return Promise.resolve();
}
@@ -287,7 +286,7 @@ export class Menu extends Ion {
*/
_prevent() {
// used to prevent unwanted opening/closing after swiping open/close
// or swiping open the menu while pressing down on the menu-toggle
// or swiping open the menu while pressing down on the menuToggle
this._preventTime = Date.now() + 20;
}
@@ -381,7 +380,7 @@ export class Menu extends Ion {
if (menuId) {
menu = app.getComponent(menuId);
if (!menu) {
console.error('Menu with id "' + menuId + '" cannot be found for menu-toggle');
console.error('Menu with id "' + menuId + '" cannot be found for menuToggle');
return;
}
@@ -391,7 +390,7 @@ export class Menu extends Ion {
menu = app.getComponent('rightMenu');
}
if (!menu) {
console.error('Menu with id "leftMenu" or "rightMenu" cannot be found for menu-toggle');
console.error('Menu with id "leftMenu" or "rightMenu" cannot be found for menuToggle');
return;
}
}

2
ionic/components/menu/test/basic/e2e.ts
View File

@@ -5,5 +5,5 @@ it('should toggle open menu', function() {
it('should close menu', function() {
element(by.css('[menu-close=leftMenu]')).click();
element(by.css('[menuClose=leftMenu]')).click();
});

8
ionic/components/menu/test/basic/main.html
View File

@@ -8,11 +8,11 @@
<ion-list>
<button ion-item *ng-for="#p of pages" (click)="openPage(p)">
<button ion-item *ngFor="#p of pages" (click)="openPage(p)">
{{p.title}}
</button>
<button ion-item menu-close="leftMenu" detail-none>
<button ion-item menuClose="leftMenu" detail-none>
Close Menu
</button>
@@ -32,11 +32,11 @@
<ion-list>
<button ion-item *ng-for="#p of pages" (click)="openPage(p)">
<button ion-item *ngFor="#p of pages" (click)="openPage(p)">
{{p.title}}
</button>
<button ion-item menu-close="rightMenu" detail-none>
<button ion-item menuClose="rightMenu" detail-none>
Close Menu
</button>

8
ionic/components/menu/test/basic/page1.html
View File

@@ -1,7 +1,7 @@
<ion-navbar *navbar>
<button menu-toggle="leftMenu">
<button menuToggle="leftMenu">
<icon menu></icon>
</button>
@@ -21,7 +21,7 @@
</button>
</ion-buttons>
<button menu-toggle="rightMenu" right secondary>
<button menuToggle="rightMenu" right secondary>
<icon menu></icon>
</button>
@@ -33,11 +33,11 @@
<h3>Page 1</h3>
<p>
<button class="e2eContentToggleMenu" menu-toggle="leftMenu">Toggle Left Menu</button>
<button class="e2eContentToggleMenu" menuToggle="leftMenu">Toggle Left Menu</button>
</p>
<p>
<button class="e2eContentToggleMenu" menu-toggle="rightMenu">Toggle Right Menu</button>
<button class="e2eContentToggleMenu" menuToggle="rightMenu">Toggle Right Menu</button>
</p>
<ion-card>

4
ionic/components/menu/test/basic/page2.html
View File

@@ -1,7 +1,7 @@
<ion-navbar *navbar>
<button menu-toggle="leftMenu">
<button menuToggle="leftMenu">
<icon menu></icon>
</button>
@@ -16,7 +16,7 @@
<h3>Page 2</h3>
<p>
<button menu-toggle="leftMenu" class="e2eContentToggleMenu">Toggle Left Menu</button>
<button menuToggle="leftMenu" class="e2eContentToggleMenu">Toggle Left Menu</button>
</p>
<p>

4
ionic/components/menu/test/basic/page3.html
View File

@@ -5,7 +5,7 @@
Menu
</ion-title>
<button menu-toggle="rightMenu" right>
<button menuToggle="rightMenu" right>
<icon menu></icon>
</button>
@@ -17,7 +17,7 @@
<h3>Page 3</h3>
<p>
<button menu-toggle="rightMenu">Toggle Right Menu</button>
<button menuToggle="rightMenu">Toggle Right Menu</button>
</p>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>

4
ionic/components/menu/test/multiple/main.html
View File

@@ -7,7 +7,7 @@
<ion-content>
<ion-list>
<button ion-item menu-close="menu1" detail-none>
<button ion-item menuClose="menu1" detail-none>
Close Menu 1
</button>
</ion-list>
@@ -24,7 +24,7 @@
<ion-content>
<ion-list>
<button ion-item menu-close="menu2" detail-none>
<button ion-item menuClose="menu2" detail-none>
Close Menu 2
</button>
</ion-list>

4
ionic/components/menu/test/multiple/page1.html
View File

@@ -1,6 +1,6 @@
<ion-navbar *navbar>
<button [menu-toggle]="activeMenu">
<button [menuToggle]="activeMenu">
<icon menu></icon>
</button>
<ion-title>
@@ -22,7 +22,7 @@
</p>
<p>
<button [menu-toggle]="activeMenu">Toggle Menu</button>
<button [menuToggle]="activeMenu">Toggle Menu</button>
</p>
<p>This page has two left menus, but only one is active at a time.</p>

22
ionic/components/menu/test/overlay/main.html
View File

@@ -8,7 +8,7 @@
<ion-list>
<button ion-item menu-toggle="leftMenu" detail-none>
<button ion-item menuToggle="leftMenu" detail-none>
Close Left Menu
</button>
@@ -18,24 +18,4 @@
</ion-menu>
<!-- <ion-menu [content]="content" id="rightMenu" type="reveal" side="right">
<ion-toolbar secondary>
<ion-title>Right Menu</ion-title>
</ion-toolbar>
<ion-content>
<ion-list>
<button ion-item menu-toggle="rightMenu">
Close Right Menu
</button>
</ion-list>
</ion-content>
</ion-menu> -->
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>

6
ionic/components/menu/test/overlay/page1.html
View File

@@ -1,7 +1,7 @@
<ion-navbar *navbar>
<button menu-toggle="leftMenu">
<button menuToggle="leftMenu">
<icon menu></icon>
</button>
@@ -17,11 +17,11 @@
<h3>Content</h3>
<p>
<button menu-toggle="leftMenu">Toggle Left Menu</button>
<button menuToggle="leftMenu">Toggle Left Menu</button>
</p>
<p>
<button menu-toggle="rightMenu">Toggle Right Menu</button>
<button menuToggle="rightMenu">Toggle Right Menu</button>
</p>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>

22
ionic/components/menu/test/push/main.html
View File

@@ -8,7 +8,7 @@
<ion-list>
<button ion-item menu-toggle="leftMenu" detail-none>
<button ion-item menuToggle="leftMenu" detail-none>
Close Left Menu
</button>
@@ -18,24 +18,4 @@
</ion-menu>
<!-- <ion-menu [content]="content" id="rightMenu" type="reveal" side="right">
<ion-toolbar secondary>
<ion-title>Right Menu</ion-title>
</ion-toolbar>
<ion-content>
<ion-list>
<button ion-item menu-toggle="rightMenu">
Close Right Menu
</button>
</ion-list>
</ion-content>
</ion-menu> -->
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>

6
ionic/components/menu/test/push/page1.html
View File

@@ -1,7 +1,7 @@
<ion-navbar *navbar>
<button menu-toggle="leftMenu">
<button menuToggle="leftMenu">
<icon menu></icon>
</button>
@@ -17,11 +17,11 @@
<h3>Content</h3>
<p>
<button menu-toggle="leftMenu">Toggle Left Menu</button>
<button menuToggle="leftMenu">Toggle Left Menu</button>
</p>
<p>
<button menu-toggle="rightMenu">Toggle Right Menu</button>
<button menuToggle="rightMenu">Toggle Right Menu</button>
</p>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>

22
ionic/components/menu/test/reveal/main.html
View File

@@ -8,7 +8,7 @@
<ion-list>
<button ion-item menu-toggle="leftMenu" detail-none>
<button ion-item menuToggle="leftMenu" detail-none>
Close Left Menu
</button>
@@ -18,24 +18,4 @@
</ion-menu>
<!-- <ion-menu [content]="content" id="rightMenu" type="reveal" side="right">
<ion-toolbar secondary>
<ion-title>Right Menu</ion-title>
</ion-toolbar>
<ion-content>
<ion-list>
<button ion-item menu-toggle="rightMenu">
Close Right Menu
</button>
</ion-list>
</ion-content>
</ion-menu> -->
<ion-nav id="nav" [root]="rootView" #content swipe-back-enabled="false"></ion-nav>

6
ionic/components/menu/test/reveal/page1.html
View File

@@ -1,7 +1,7 @@
<ion-navbar *navbar>
<button menu-toggle="leftMenu">
<button menuToggle="leftMenu">
<icon menu></icon>
</button>
@@ -17,11 +17,11 @@
<h3>Content</h3>
<p>
<button menu-toggle="leftMenu">Toggle Left Menu</button>
<button menuToggle="leftMenu">Toggle Left Menu</button>
</p>
<p>
<button menu-toggle="rightMenu">Toggle Right Menu</button>
<button menuToggle="rightMenu">Toggle Right Menu</button>
</p>
<f></f><f></f><f></f><f></f><f></f><f></f><f></f><f></f>