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

refactor(nav): adds some asserts and small changes

Browse Source
This commit is contained in:
Manu Mtz.-Almeida
2016-10-18 19:09:04 +02:00
parent ac0e48b7fb
commit 5ad4c542be
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/components/item/item-sliding-gesture.ts
View File

@ -64,6 +64,7 @@ export class ItemSlidingGesture extends PanGesture {
onDragEnd(ev: any) { onDragEnd(ev: any) {
ev.preventDefault(); ev.preventDefault();
let coordX = pointerCoord(ev).x; let coordX = pointerCoord(ev).x;
let deltaX = (coordX - this.firstCoordX); let deltaX = (coordX - this.firstCoordX);
let deltaT = (Date.now() - this.firstTimestamp); let deltaT = (Date.now() - this.firstTimestamp);

6
src/components/item/item-sliding.ts
View File

@ -2,7 +2,7 @@ import { ChangeDetectionStrategy, Component, ContentChildren, ContentChild, Dire
import { CSS, nativeRaf, nativeTimeout, clearNativeTimeout } from '../../util/dom'; import { CSS, nativeRaf, nativeTimeout, clearNativeTimeout } from '../../util/dom';
import { Item } from './item'; import { Item } from './item';
import { isPresent } from '../../util/util'; import { isPresent, assert } from '../../util/util';
import { List } from '../list/list'; import { List } from '../list/list';
const SWIPE_MARGIN = 30; const SWIPE_MARGIN = 30;
@ -294,7 +294,7 @@ export class ItemSliding {
case ItemSideFlags.Right: openAmount = Math.max(0, openAmount); break; case ItemSideFlags.Right: openAmount = Math.max(0, openAmount); break;
case ItemSideFlags.Left: openAmount = Math.min(0, openAmount); break; case ItemSideFlags.Left: openAmount = Math.min(0, openAmount); break;
case ItemSideFlags.Both: break; case ItemSideFlags.Both: break;
default: return; default: assert(true, 'invalid ItemSideFlags value'); break;
} }
if (openAmount > this._optsWidthRightSide) { if (openAmount > this._optsWidthRightSide) {
@ -354,11 +354,13 @@ export class ItemSliding {
this._optsWidthRightSide = 0; this._optsWidthRightSide = 0;
if (this._rightOptions) { if (this._rightOptions) {
this._optsWidthRightSide = this._rightOptions.width(); this._optsWidthRightSide = this._rightOptions.width();
assert(this._optsWidthRightSide > 0, '_optsWidthRightSide should not be zero');
} }
this._optsWidthLeftSide = 0; this._optsWidthLeftSide = 0;
if (this._leftOptions) { if (this._leftOptions) {
this._optsWidthLeftSide = this._leftOptions.width(); this._optsWidthLeftSide = this._leftOptions.width();
assert(this._optsWidthLeftSide > 0, '_optsWidthLeftSide should not be zero');
} }
this._optsDirty = false; this._optsDirty = false;
}); });