Updating bootstrap3-dialog.

ivantcholakov · Jan 25, 2016 · 30baaca · 30baaca
1 parent d8bb96f
commit 30baaca
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/www/assets/js/lib/bootstrap3-dialog/bootstrap-dialog.js b/www/assets/js/lib/bootstrap3-dialog/bootstrap-dialog.js
@@ -309,9 +309,11 @@
     BootstrapDialog.moveFocus = function () {
         var lastDialogInstance = null;
         $.each(BootstrapDialog.dialogs, function (id, dialogInstance) {
-            lastDialogInstance = dialogInstance;
+            if (dialogInstance.isRealized() && dialogInstance.isOpened()) {
+                lastDialogInstance = dialogInstance;
+            }
         });
-        if (lastDialogInstance !== null && lastDialogInstance.isRealized()) {
+        if (lastDialogInstance !== null) {
             lastDialogInstance.getModal().focus();
         }
     };
@@ -335,7 +337,9 @@
             var zIndexModal = 1050;
             var dialogCount = 0;
             $.each(BootstrapDialog.dialogs, function (dialogId, dialogInstance) {
-                dialogCount++;
+                if (dialogInstance.isRealized() && dialogInstance.isOpened()) {
+                    dialogCount++;
+                }
             });
             var $modal = this.getModal();
             var $backdrop = $modal.data('bs.modal').$backdrop;