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(sideMenuController): sticking issue #738

Browse Source
This commit is contained in:
Max Lynch
2014-03-09 17:44:00 -05:00
parent 1b727790fe
commit ea04e393c0
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
js/controllers/sideMenuController.js
View File

@@ -139,12 +139,27 @@
var maxLeft = this.left && this.left.width || 0;
var maxRight = this.right && this.right.width || 0;
console.log('Opening amount', amount);
// Check if we can move to that side, depending if the left/right panel is enabled
if((!(this.left && this.left.isEnabled) && amount > 0) || (!(this.right && this.right.isEnabled) && amount < 0)) {
if(!(this.left && this.left.isEnabled) && amount > 0) {
this.content.setTranslateX(0);
return;
}
if((this._leftShowing && amount > maxLeft) || (this._rightShowing && amount < -maxRight)) {
if(!(this.right && this.right.isEnabled) && amount < 0) {
console.log('Blocked right');
this.content.setTranslateX(0);
return;
}
if(this._leftShowing && amount > maxLeft) {
this.content.setTranslateX(maxLeft);
return;
}
if(this._rightShowing && amount < -maxRight) {
this.content.setTranslateX(-maxRight);
return;
}

3
js/ext/angular/test/sideMenu.html
View File

@@ -24,7 +24,8 @@
<h1>Content</h1>
</ion-content>
</ion-pane>
<ion-side-menu side="left" width="$root.menuWidth || 200" ng-controller="LeftCtrl">
<ion-side-menu side="left" width="$root.menuWidth || 270" ng-controller="LeftCtrl">
<header class="bar bar-header bar-assertive">
<h1 class="title">Left</h1>
</header>