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

merge updates

Browse Source
This commit is contained in:
Adam Bradley
2013-11-07 17:01:45 -06:00
parent 96816b0392 bbfa3b8c58
commit fd6f400ddd
2 changed files with 28 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
dist/js/ionic-angular.js vendored
View File

@ -1030,12 +1030,25 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$element.addClass('menu-content'); $element.addClass('menu-content');
var defaultPrevented = false;
ionic.on('mousedown', function(e) {
// If the child element prevented the drag, don't drag
defaultPrevented = e.defaultPrevented;
});
Gesture.on('drag', function(e) { Gesture.on('drag', function(e) {
if(defaultPrevented) {
return;
}
sideMenuCtrl._handleDrag(e); sideMenuCtrl._handleDrag(e);
}, $element[0]); }, $element[0]);
Gesture.on('release', function(e) { Gesture.on('release', function(e) {
sideMenuCtrl._endDrag(e); if(!defaultPrevented) {
sideMenuCtrl._endDrag(e);
}
defaultPrevented = false;
}, $element[0]); }, $element[0]);
sideMenuCtrl.setContent({ sideMenuCtrl.setContent({

15
js/ext/angular/src/directive/ionicSideMenu.js vendored
View File

@ -65,12 +65,25 @@ angular.module('ionic.ui.sideMenu', ['ionic.service.gesture'])
$element.addClass('menu-content'); $element.addClass('menu-content');
var defaultPrevented = false;
ionic.on('mousedown', function(e) {
// If the child element prevented the drag, don't drag
defaultPrevented = e.defaultPrevented;
});
Gesture.on('drag', function(e) { Gesture.on('drag', function(e) {
if(defaultPrevented) {
return;
}
sideMenuCtrl._handleDrag(e); sideMenuCtrl._handleDrag(e);
}, $element[0]); }, $element[0]);
Gesture.on('release', function(e) { Gesture.on('release', function(e) {
sideMenuCtrl._endDrag(e); if(!defaultPrevented) {
sideMenuCtrl._endDrag(e);
}
defaultPrevented = false;
}, $element[0]); }, $element[0]);
sideMenuCtrl.setContent({ sideMenuCtrl.setContent({