Fix focus not returned correctly when active element is the lightbox …

…root element
jsor · Nov 21, 2016 · b4945c5 · b4945c5
1 parent 1c45f89
commit b4945c5
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 7 deletions.
diff --git a/dist/lity.css b/dist/lity.css
@@ -1,4 +1,4 @@
-/*! Lity - v2.2.0 - 2016-10-08
+/*! Lity - v2.2.0 - 2016-11-21
 * http://sorgalla.com/lity/
 * Copyright (c) 2015-2016 Jan Sorgalla; Licensed MIT */
 .lity {

diff --git a/dist/lity.js b/dist/lity.js
@@ -1,4 +1,4 @@
-/*! Lity - v2.2.0 - 2016-10-08
+/*! Lity - v2.2.0 - 2016-11-21
 * http://sorgalla.com/lity/
 * Copyright (c) 2015-2016 Jan Sorgalla; Licensed MIT */
 (function(window, factory) {
@@ -511,7 +511,13 @@
             var deferred = _deferred();
 
             // We return focus only if the current focus is inside this instance
-            if (activeElement && $.contains(element[0], document.activeElement)) {
+            if (
+                activeElement &&
+                (
+                    document.activeElement === element[0] ||
+                    $.contains(element[0], document.activeElement)
+                )
+            ) {
                 activeElement.focus();
             }
 

diff --git a/dist/lity.min.css b/dist/lity.min.css
diff --git a/dist/lity.min.js b/dist/lity.min.js
diff --git a/src/lity.js b/src/lity.js
@@ -508,7 +508,13 @@
             var deferred = _deferred();
 
             // We return focus only if the current focus is inside this instance
-            if (activeElement && $.contains(element[0], document.activeElement)) {
+            if (
+                activeElement &&
+                (
+                    document.activeElement === element[0] ||
+                    $.contains(element[0], document.activeElement)
+                )
+            ) {
                 activeElement.focus();
             }