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

refactor(toggle): simplied RTL support

Browse Source
This commit is contained in:
Manuel Mtz-Almeida
2017-06-09 15:46:24 +02:00
parent 435f5c4db0
commit ac52d3b724
1 changed files with 19 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
src/components/toggle/toggle.ts
View File

@@ -150,30 +150,10 @@ export class Toggle extends BaseInput<boolean> implements IonicTapInput, AfterCo
return;
}
let dirty = false;
let value: boolean;
let activated: boolean;
if (this._value) {
if ((this._plt.isRTL && (currentX - 15 > this._startX)) ||
(!this._plt.isRTL && (currentX + 15 < this._startX))) {
dirty = true;
value = false;
activated = true;
}
} else if ((this._plt.isRTL && (currentX + 15 < this._startX)) ||
(!this._plt.isRTL && (currentX - 15 > this._startX))){
dirty = true;
value = true;
activated = (this._plt.isRTL ? (currentX > this._startX - 5) : (currentX < this._startX + 5));
}
if (dirty) {
if (this._shouldToggle(currentX, -15)) {
this._zone.run(() => {
this.value = value;
this.value = !this.value;
this._startX = currentX;
this._activated = activated;
this._haptic.selection();
});
}
@@ -191,16 +171,8 @@ export class Toggle extends BaseInput<boolean> implements IonicTapInput, AfterCo
console.debug('toggle, _onDragEnd', endX);
this._zone.run(() => {
if (this._value) {
if ((this._plt.isRTL && (this._startX - 4 < endX)) ||
(!this._plt.isRTL && (this._startX + 4 > endX))){
this.value = false;
this._haptic.selection();
}
} else if ((this._plt.isRTL && (this._startX + 4 > endX)) ||
(!this._plt.isRTL && (this._startX - 4 < endX))) {
this.value = true;
if (this._shouldToggle(endX, 4)) {
this.value = !this.value;
this._haptic.selection();
}
@@ -210,6 +182,21 @@ export class Toggle extends BaseInput<boolean> implements IonicTapInput, AfterCo
});
}
/**
* @hidden
*/
_shouldToggle(currentX: number, margin: number): boolean {
const isLTR = !this._plt.isRTL;
const startX = this._startX;
if (this._value) {
return (isLTR && (startX + margin > currentX)) ||
(!isLTR && (startX - margin < currentX));
} else {
return (isLTR && (startX - margin < currentX)) ||
(!isLTR && (startX + margin > currentX));
}
}
/**
* @hidden
*/