From 1b096a4251e05f5b2e9991c565686d62c4e36805 Mon Sep 17 00:00:00 2001 From: Max Lynch Date: Tue, 4 Mar 2014 13:34:55 -0600 Subject: [PATCH] fix(ionContent) - Fixed embedded object click. Fixes #723 --- js/ext/angular/test/embeddedObject.html | 76 +++++++++++++++++++++++++ js/views/scrollView.js | 5 +- 2 files changed, 80 insertions(+), 1 deletion(-) create mode 100644 js/ext/angular/test/embeddedObject.html diff --git a/js/ext/angular/test/embeddedObject.html b/js/ext/angular/test/embeddedObject.html new file mode 100644 index 0000000000..98312c9eb9 --- /dev/null +++ b/js/ext/angular/test/embeddedObject.html @@ -0,0 +1,76 @@ + + + + Content + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/js/views/scrollView.js b/js/views/scrollView.js index f98c422a2e..3cf17dfc52 100644 --- a/js/views/scrollView.js +++ b/js/views/scrollView.js @@ -1,4 +1,5 @@ var IS_INPUT_LIKE_REGEX = /input|textarea|select/i; +var IS_EMBEDDED_OBJECT_REGEX = /object|embed/i; /* * Scroller * http://github.com/zynga/scroller @@ -620,7 +621,8 @@ 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.isContentEditable || + e.target.tagName.match(IS_EMBEDDED_OBJECT_REGEX); } @@ -650,6 +652,7 @@ ionic.views.Scroll = ionic.views.View.inherit({ var mousedown = false; container.addEventListener("mousedown", function(e) { + console.log('Touch start', e); if (e.defaultPrevented || shouldIgnorePress(e)) { return; }