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

fix(menu): rtl gesture for menu (#11830)

Browse Source 
* fix(menu): rtl fix for menu

* disable PropertySpelling in scss-lint for this special case

* Revert "disable PropertySpelling in scss-lint for this special case"

This reverts commit 87c3302fc2.

* remove scss changes because of the conflict

* Fix left (default) menu position

* Revert "Fix left (default) menu position"

This reverts commit f657369540.

* trim down ifs

* remove unnecessary this
This commit is contained in:
Sina
2017-06-09 16:28:31 +04:30
committed by Manu MA
parent 75bfbad21e
commit 30047f004e
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/menu/menu-gestures.ts
View File

@@ -57,14 +57,14 @@ export class MenuContentGesture extends SlideEdgeGesture {
}
onSlide(slide: SlideData, ev: any) {
const z = (this.menu.isRightSide ? slide.min : slide.max);
const z = (this.menu.isRightSide !== this.plt.isRTL ? slide.min : slide.max);
const stepValue = (slide.distance / z);
this.menu._swipeProgress(stepValue);
}
onSlideEnd(slide: SlideData, ev: any) {
let z = (this.menu.isRightSide ? slide.min : slide.max);
let z = (this.menu.isRightSide !== this.plt.isRTL ? slide.min : slide.max);
const currentStepValue = (slide.distance / z);
const velocity = slide.velocity;
z = Math.abs(z * 0.5);
@@ -89,7 +89,7 @@ export class MenuContentGesture extends SlideEdgeGesture {
getElementStartPos(slide: SlideData, ev: any) {
const menu = this.menu;
if (menu.isRightSide) {
if (menu.isRightSide !== this.plt.isRTL) {
return menu.isOpen ? slide.min : slide.max;
}
// left menu
@@ -98,7 +98,7 @@ export class MenuContentGesture extends SlideEdgeGesture {
getSlideBoundaries(): { min: number, max: number } {
const menu = this.menu;
if (menu.isRightSide) {
if (menu.isRightSide !== this.plt.isRTL) {
return {
min: -menu.width(),
max: 0

5
src/components/menu/menu.ts
View File

@@ -490,10 +490,11 @@ export class Menu implements RootNode, MenuInterface, OnInit, OnDestroy {
// user has finished dragging the menu
const isRightSide = this.isRightSide;
const isRTL = this._plt.isRTL;
const opening = !this.isOpen;
const shouldComplete = (opening)
? isRightSide ? shouldCompleteLeft : shouldCompleteRight
: isRightSide ? shouldCompleteRight : shouldCompleteLeft;
? (isRightSide !== isRTL) ? shouldCompleteLeft : shouldCompleteRight
: (isRightSide !== isRTL) ? shouldCompleteRight : shouldCompleteLeft;
this._getType().setProgressEnd(shouldComplete, stepValue, velocity, (isOpen: boolean) => {
console.debug('menu, swipeEnd', this.side);