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(scrollView): use defaultPrevented

Browse Source
This commit is contained in:
Andy Joslin
2014-02-12 13:02:08 -05:00
parent 1437534d44
commit 4cba7aa6a9
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
js/views/scrollView.js
View File

@@ -610,7 +610,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
self.scrollTo(0, elementScrollTop + elementHeight - (deviceHeight * 0.5), true);
}
//Only the first scrollView parent of the element that broadcasted this event
//Only the first scrollView parent of the element that broadcasted this event
//(the active element that needs to be shown) should receive this event
e.stopPropagation();
});
@@ -618,7 +618,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
if ('ontouchstart' in window) {
container.addEventListener("touchstart", function(e) {
if (e.__scroller) {
if (e.defaultPrevented) {
return;
}
// Don't react if initial down happens on a form element
@@ -628,8 +628,6 @@ ionic.views.Scroll = ionic.views.View.inherit({
self.doTouchStart(e.touches, e.timeStamp);
e.preventDefault();
//We don't want to stop propagation, other things might want to know about the touchstart
e.__scroller = true;
}, false);
document.addEventListener("touchmove", function(e) {
@@ -648,7 +646,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
var mousedown = false;
container.addEventListener("mousedown", function(e) {
if (e.__scroller) {
if (e.defaultPrevented) {
return;
}
// Don't react if initial down happens on a form element
@@ -661,8 +659,7 @@ ionic.views.Scroll = ionic.views.View.inherit({
pageY: e.pageY
}], e.timeStamp);
//We don't want to stop propagation, other things might want to know about the touchstart
e.__scroller = true;
e.preventDefault();
mousedown = true;
}, false);