Returns click focus to parent window when iframe is clicked so that t…

…he Escape-to-close will work; fixes #47
NUKnightLab · Sep 16, 2016 · 8f9dbc1 · 8f9dbc1
1 parent d33e2e0
commit 8f9dbc1
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/src/js/bookmarklet.js b/src/js/bookmarklet.js
@@ -11,6 +11,7 @@ function iFrame(apiRoot) {
         url = composeURL(text, image, cite)
 
         loadTemplate(url);
+        bindEscape();
 
         return false;
     }
@@ -71,6 +72,15 @@ function iFrame(apiRoot) {
         document.body.removeChild(bookMarklet)
     }
 
+    function bindEscape() {
+        document.onkeydown = function(evt) {
+            if ( evt.key === 'Escape'
+                || evt.keyCode === 27) {
+            }
+            bookmarklet.iFrame().closeiFrame();
+        }
+    }
+
     return {
         init: init,
         closeiFrame: closeiFrame

diff --git a/src/js/compositions.js b/src/js/compositions.js
@@ -103,6 +103,15 @@ KL.Pullquote = (function() {
         }
     };
 
+    bindClicks = function() {
+        /* Return click focus to parent of iframe so parent keybindings
+         * continue to work.
+         */
+        document.onclick = function(evt) {
+            window.parent.focus();
+        };
+    }
+
     /**
      * _init: creates the composition for pullquote
      *
@@ -122,7 +131,9 @@ KL.Pullquote = (function() {
             //{ position: "kl-anchor-left", use_image: true },
             //{ position: "kl-anchor-right", use_image: true },
             //{ position: "kl-anchor-false", use_image: false }
-        ])
+        ]);
+
+        bindClicks();
     }();
 
 })();
diff --git a/src/templates/index.hbs b/src/templates/index.hbs
@@ -60,12 +60,6 @@
                   });
                   req.open('GET', '{{ pullquoteURL }}templates/template.html');
                   req.send();
-                  document.onkeydown = function(evt) {
-                      if ( evt.key === 'Escape'
-                           || evt.keyCode === 27) {
-                      }
-                      bookmarklet.iFrame().closeiFrame();
-                  }
               }
       })();"