django-cms
diff --git a/‎CHANGELOG.txt
Lines changed: 1 addition & 0 deletions b/‎CHANGELOG.txt
Lines changed: 1 addition & 0 deletions
diff --git a/‎cms/static/cms/js/dist/3.4.3/bundle.toolbar.min.js
Lines changed: 1 addition & 1 deletion b/‎cms/static/cms/js/dist/3.4.3/bundle.toolbar.min.js
Lines changed: 1 addition & 1 deletion
diff --git a/‎cms/static/cms/js/modules/cms.modal.js
Lines changed: 20 additions & 2 deletions b/‎cms/static/cms/js/modules/cms.modal.js
Lines changed: 20 additions & 2 deletions
@@ -8,6 +8,7 @@
   users with change permissions, unless the ``preview`` GET parameter is used.
 * Fixed "Expand all / Collapse all" not reflecting real state of the placeholder tree
 * Fixed a bug where Aliased plugins would render even if their host page was unpublished.
+* Fixed a bug where focusing inputs in modal would require 2 clicks in some browsers
 
 
 === 3.4.5 (2017-10-12) ===
 
@@ -943,9 +943,12 @@ class Modal {
                 return;
             }
 
-            body.attr('tabindex', '0');
+            // tabindex is required for keyboard navigation
+            // body.attr('tabindex', '0');
             iframe.on('focus', function() {
-                body.focus();
+                if (this.contentWindow) {
+                    this.contentWindow.focus();
+                }
             });
 
             Modal._setupCtrlEnterSave(document);
@@ -1093,6 +1096,21 @@ class Modal {
                 if (contents.find('.object-tools').length) {
                     contents.find('#content').css('padding-top', 38); // eslint-disable-line
                 }
+
+                // this is required for IE11. we assume that when the modal is opened the user is going to interact
+                // with it. if we don't focus the body directly the next time the user clicks on a field inside
+                // the iframe the focus will be stolen by body thus requiring two clicks. this immediately focuses the
+                // iframe body on load except if something is already focused there
+                // (django tries to focus first field by default)
+                setTimeout(() => {
+                    if (!iframe[0] || !iframe[0].contentDocument || !iframe[0].contentDocument.documentElement) {
+                        return;
+                    }
+                    if ($(iframe[0].contentDocument.documentElement).find(':focus').length) {
+                        return;
+                    }
+                    iframe.trigger('focus');
+                }, 0); // eslint-disable-line
             }
 
             that._attachContentPreservingHandlers(iframe);