From f1ed4b0084d6457959fe4c65cdefac34148278c3 Mon Sep 17 00:00:00 2001 From: Adam Bradley Date: Mon, 24 Mar 2014 15:51:10 -0500 Subject: [PATCH] fix(reorder): Prevent scroll w/ data-prevent-scroll attr on reorder btn, closes #848 --- js/ext/angular/src/directive/ionicList.js | 2 +- js/ext/angular/test/list.html | 75 +---------------------- js/views/scrollView.js | 5 +- 3 files changed, 5 insertions(+), 77 deletions(-) diff --git a/js/ext/angular/src/directive/ionicList.js b/js/ext/angular/src/directive/ionicList.js index 6b3b1a3d23..8bfe436b3a 100644 --- a/js/ext/angular/src/directive/ionicList.js +++ b/js/ext/angular/src/directive/ionicList.js @@ -68,7 +68,7 @@ angular.module('ionic.ui.list', ['ngAnimate']) \ \
\ - \ + \
\
\ \ diff --git a/js/ext/angular/test/list.html b/js/ext/angular/test/list.html index 2eabd731b3..dee7f0c980 100644 --- a/js/ext/angular/test/list.html +++ b/js/ext/angular/test/list.html @@ -2,82 +2,9 @@ List - - - + - -
CLICK!
diff --git a/js/views/scrollView.js b/js/views/scrollView.js index 425c17c374..ac423525e4 100644 --- a/js/views/scrollView.js +++ b/js/views/scrollView.js @@ -621,8 +621,9 @@ ionic.views.Scroll = ionic.views.View.inherit({ function shouldIgnorePress(e) { // Don't react if initial down happens on a form element return e.target.tagName.match(IS_INPUT_LIKE_REGEX) || - e.target.isContentEditable || - e.target.tagName.match(IS_EMBEDDED_OBJECT_REGEX); + e.target.isContentEditable || + e.target.tagName.match(IS_EMBEDDED_OBJECT_REGEX) || + e.target.dataset.preventScroll; }