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

Swipe me yo\!

Browse Source
This commit is contained in:
Max Lynch
2013-08-26 19:44:10 -05:00
parent b6a4f42885
commit 4e4b979204
4 changed files with 17 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
example/events.html
View File

@ -7,8 +7,12 @@
<meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no"> <meta name="viewport" content="initial-scale=1, maximum-scale=1, user-scalable=no">
<link rel="stylesheet" href="../../dist/framework.css"> <link rel="stylesheet" href="../../dist/framework.css">
<link rel="stylesheet" href="app.css"> <link rel="stylesheet" href="app.css">
<script> <style>
</script> .swiperight {
-webkit-transition: 0.1s ease-in-out all;
-webkit-transform:translate3d(120%,0,0) ;
}
</style>
</head> </head>
<body> <body>
<div class="content content-padded"> <div class="content content-padded">

2
example/events.js
View File

@ -32,8 +32,6 @@ window.FM.on('swipe', function(e) {
type: 'swipe', type: 'swipe',
event: e event: e
}); });
e.target.classList.add('swipeleft');
}); });
window.FM.on('swiperight', function(e) { window.FM.on('swiperight', function(e) {
console.log('GOT SWIPE RIGHT', e); console.log('GOT SWIPE RIGHT', e);

3
js/framework/framework-events.js
View File

@ -21,8 +21,9 @@
*/ */
trigger: function(eventType, data) { trigger: function(eventType, data) {
// TODO: Do we need to use the old-school createEvent stuff? // TODO: Do we need to use the old-school createEvent stuff?
var event = new CustomEvent(eventType, data);
window.dispatchEvent(new CustomEvent(eventType, data)); data.target && data.target.dispatchEvent(event) || window.dispatchEvent(event);
}, },
/** /**

31
js/framework/framework-gestures.js
View File

@ -12,10 +12,7 @@
framework.Gesture.Touch = { framework.Gesture.Touch = {
handle: function(e) { handle: function(e) {
if(e.type == 'touchstart') { if(e.type == 'touchstart') {
framework.EventController.trigger('touch', { framework.GestureController.triggerGestureEvent('touch', e);
cancelable: true,
bubbles: true
});
} }
} }
}; };
@ -45,10 +42,7 @@
break; break;
case 'touchend': case 'touchend':
if(this._hasMoved == false) { if(this._hasMoved == false) {
framework.EventController.trigger('tap', { framework.GestureController.triggerGestureEvent('tap', e);
cancelable: true,
bubbles: true
});
} }
break; break;
} }
@ -59,10 +53,7 @@
framework.Gesture.Release = { framework.Gesture.Release = {
handle: function(e) { handle: function(e) {
if(e.type === 'touchend') { if(e.type === 'touchend') {
framework.EventController.trigger('release', { framework.GestureController.triggerGestureEvent('release', e);
cancelable: true,
bubbles: true
});
} }
} }
}; };
@ -78,16 +69,8 @@
// trigger swipe events, both a general swipe, // trigger swipe events, both a general swipe,
// and a directional swipe // and a directional swipe
framework.EventController.trigger('swipe', { framework.GestureController.triggerGestureEvent('swipe', e);
gesture: e, framework.GestureController.triggerGestureEvent('swipe' + e.direction, e);
cancelable: true,
bubbles: true
});
framework.EventController.trigger('swipe' + e.direction, {
gesture: e,
cancelable: true,
bubbles: true
});
} }
} }
} }
@ -102,6 +85,10 @@
framework.Gesture.Release, framework.Gesture.Release,
], ],
triggerGestureEvent: function(type, e) {
framework.EventController.trigger(type, framework.Utils.extend({}, e));
},
_annotateGestureEvent: function(e) { _annotateGestureEvent: function(e) {
// If this doesn't have touches, we need to grab the last set that did // If this doesn't have touches, we need to grab the last set that did
var touches = e.touches; var touches = e.touches;