From 850147f7266f7ad087c9f4b8d808d406f96eb5ab Mon Sep 17 00:00:00 2001
From: Dan Allen <dan.j.allen@gmail.com>
Date: Thu, 13 Aug 2015 19:59:12 -0600
Subject: [PATCH] detect active form element more accurately

---
 demo/index.html                |  1 +
 dist/bespoke-forms.js          | 16 +++++++++-------
 dist/bespoke-forms.min.js      |  4 ++--
 lib/bespoke-forms.js           | 14 ++++++++------
 test/spec/bespoke-formsSpec.js |  9 ++++-----
 5 files changed, 24 insertions(+), 20 deletions(-)
 mode change 100755 => 100644 dist/bespoke-forms.js
 mode change 100755 => 100644 dist/bespoke-forms.min.js

diff --git a/demo/index.html b/demo/index.html
index b278a1d..4f969f8 100644
--- a/demo/index.html
+++ b/demo/index.html
@@ -27,6 +27,7 @@ <h1>bespoke-forms</h1>
         <div contenteditable="true">This div is editable</div>
       </section>
       <section>
+        <input type="text" value="readonly" readonly />
       </section>
     </article>
 
diff --git a/dist/bespoke-forms.js b/dist/bespoke-forms.js
old mode 100755
new mode 100644
index acb9c6a..f2e4298
--- a/dist/bespoke-forms.js
+++ b/dist/bespoke-forms.js
@@ -1,7 +1,7 @@
 /*!
  * bespoke-forms v1.0.0
  *
- * Copyright 2014, Mark Dalgleish
+ * Copyright 2015, Mark Dalgleish
  * This content is released under the MIT license
  * http://mit-license.org/markdalgleish
  */
@@ -9,12 +9,14 @@
 !function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var o;"undefined"!=typeof window?o=window:"undefined"!=typeof global?o=global:"undefined"!=typeof self&&(o=self);var f=o;f=f.bespoke||(f.bespoke={}),f=f.plugins||(f.plugins={}),f.forms=e()}}(function(){var define,module,exports;return (function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({1:[function(_dereq_,module,exports){
 module.exports = function() {
   return function(deck) {
-    deck.slides.forEach(function(slide) {
-      slide.addEventListener('keydown', function(e) {
-        if (/INPUT|TEXTAREA|SELECT/.test(e.target.nodeName) || e.target.contentEditable === 'true') {
-          e.stopPropagation();
-        }
-      });
+    var acceptsInput = function(element) {
+      return ('disabled' in element) || element.contentEditable === 'true';
+    };
+
+    deck.parent.addEventListener('keydown', function(e) {
+      if (acceptsInput(e.target)) {
+        e.stopPropagation();
+      }
     });
   };
 };
diff --git a/dist/bespoke-forms.min.js b/dist/bespoke-forms.min.js
old mode 100755
new mode 100644
index 4fae937..5686e22
--- a/dist/bespoke-forms.min.js
+++ b/dist/bespoke-forms.min.js
@@ -1,2 +1,2 @@
-/*! bespoke-forms v1.0.0 © 2014 Mark Dalgleish, MIT License */
-!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;"undefined"!=typeof window?n=window:"undefined"!=typeof global?n=global:"undefined"!=typeof self&&(n=self);var t=n;t=t.bespoke||(t.bespoke={}),t=t.plugins||(t.plugins={}),t.forms=e()}}(function(){return function e(n,t,o){function r(i,u){if(!t[i]){if(!n[i]){var d="function"==typeof require&&require;if(!u&&d)return d(i,!0);if(f)return f(i,!0);throw new Error("Cannot find module '"+i+"'")}var p=t[i]={exports:{}};n[i][0].call(p.exports,function(e){var t=n[i][1][e];return r(t?t:e)},p,p.exports,e,n,t,o)}return t[i].exports}for(var f="function"==typeof require&&require,i=0;i<o.length;i++)r(o[i]);return r}({1:[function(e,n){n.exports=function(){return function(e){e.slides.forEach(function(e){e.addEventListener("keydown",function(e){(/INPUT|TEXTAREA|SELECT/.test(e.target.nodeName)||"true"===e.target.contentEditable)&&e.stopPropagation()})})}}},{}]},{},[1])(1)});
\ No newline at end of file
+/*! bespoke-forms v1.0.0 © 2015 Mark Dalgleish, MIT License */
+!function(e){if("object"==typeof exports&&"undefined"!=typeof module)module.exports=e();else if("function"==typeof define&&define.amd)define([],e);else{var n;"undefined"!=typeof window?n=window:"undefined"!=typeof global?n=global:"undefined"!=typeof self&&(n=self);var t=n;t=t.bespoke||(t.bespoke={}),t=t.plugins||(t.plugins={}),t.forms=e()}}(function(){return function e(n,t,r){function o(f,u){if(!t[f]){if(!n[f]){var d="function"==typeof require&&require;if(!u&&d)return d(f,!0);if(i)return i(f,!0);throw new Error("Cannot find module '"+f+"'")}var p=t[f]={exports:{}};n[f][0].call(p.exports,function(e){var t=n[f][1][e];return o(t?t:e)},p,p.exports,e,n,t,r)}return t[f].exports}for(var i="function"==typeof require&&require,f=0;f<r.length;f++)o(r[f]);return o}({1:[function(e,n){n.exports=function(){return function(e){var n=function(e){return"disabled"in e||"true"===e.contentEditable};e.parent.addEventListener("keydown",function(e){n(e.target)&&e.stopPropagation()})}}},{}]},{},[1])(1)});
\ No newline at end of file
diff --git a/lib/bespoke-forms.js b/lib/bespoke-forms.js
index 435d5f2..02e6339 100644
--- a/lib/bespoke-forms.js
+++ b/lib/bespoke-forms.js
@@ -1,11 +1,13 @@
 module.exports = function() {
   return function(deck) {
-    deck.slides.forEach(function(slide) {
-      slide.addEventListener('keydown', function(e) {
-        if (/INPUT|TEXTAREA|SELECT/.test(e.target.nodeName) || e.target.contentEditable === 'true') {
-          e.stopPropagation();
-        }
-      });
+    var acceptsInput = function(element) {
+      return ('disabled' in element) || element.contentEditable === 'true';
+    };
+
+    deck.parent.addEventListener('keydown', function(e) {
+      if (acceptsInput(e.target)) {
+        e.stopPropagation();
+      }
     });
   };
 };
diff --git a/test/spec/bespoke-formsSpec.js b/test/spec/bespoke-formsSpec.js
index c7af5d2..169da8e 100644
--- a/test/spec/bespoke-formsSpec.js
+++ b/test/spec/bespoke-formsSpec.js
@@ -1,10 +1,9 @@
 Function.prototype.bind = Function.prototype.bind || require('function-bind');
 
-var bespoke = require('bespoke');
-var keys = require('bespoke-keys');
-var forms = require('../../lib-instrumented/bespoke-forms.js');
-
-require('simulant/simulant');
+var bespoke = require('bespoke'),
+  keys = require('bespoke-keys'),
+  forms = require('../../lib-instrumented/bespoke-forms.js'),
+  simulant = require('simulant');
 
 describe("bespoke-forms", function() {