From 942b1c84f6784bbbf02229dbc81d3ff5e1eadedb Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Mon, 8 May 2017 05:37:46 -0300
Subject: [PATCH 1/2] [modal] focusFirst timing fix

---
 lib/components/modal.vue | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/lib/components/modal.vue b/lib/components/modal.vue
index 3d770589bf8..36de25639d2 100755
--- a/lib/components/modal.vue
+++ b/lib/components/modal.vue
@@ -3,6 +3,7 @@
         <transition-group enter-class="hidden"
                           enter-to-class=""
                           enter-active-class=""
+                          @after-enter="focusFirst"
                           leave-class="show"
                           leave-active-class=""
                           leave-to-class="hidden"
@@ -184,10 +185,6 @@
                     // Handle constrained focus
                     document.addEventListener('focusin', this.enforceFocus, false);
                 }
-                this.$nextTick(function () {
-                    // Make sure DOM is updated before focusing
-                    this.focusFirst();
-                });
             },
             hide(isOK) {
                 if (!this.is_visible) {

From 62d6dde9186200a446e4a1103580481fcd9af1aa Mon Sep 17 00:00:00 2001
From: Troy Morehouse <troymore@nbnet.nb.ca>
Date: Mon, 8 May 2017 05:51:33 -0300
Subject: [PATCH 2/2] [modal] focusFirst on open timing tweak

---
 lib/components/modal.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/components/modal.vue b/lib/components/modal.vue
index 36de25639d2..9a23cdfe660 100755
--- a/lib/components/modal.vue
+++ b/lib/components/modal.vue
@@ -250,7 +250,9 @@
                 if (!el) {
                     el = this.$refs.content;
                 }
-                el.focus();
+                if (el && el.focus) {
+                    el.focus();
+                }
             },
             returnFocusTo() {
                 if (this.return_focus) {