refs #248

nakupanda · Mar 16, 2016 · 5304d56 · 5304d56
1 parent 8d66eee
commit 5304d56
Show file tree

Hide file tree

Showing 6 changed files with 42 additions and 33 deletions.
diff --git a/bower.json b/bower.json
@@ -1,7 +1,7 @@
 {
     "name": "bootstrap3-dialog",
     "description": "Make use of Bootstrap Modal more monkey-friendly. http://nakupanda.github.io/bootstrap3-dialog/",
-    "version": "1.34.9",
+    "version": "1.35.0",
     "keywords": [
         "css",
         "js",

diff --git a/changelog.txt b/changelog.txt
@@ -1,9 +1,14 @@
 LASTEST NOT RELEASED
 ------------------------------
+NONE
+
+V1.35.0
+------------------------------
 * Refs #224 *
 * Refs #208 *
 * Refs #233 *
 * Refs #247 *
+* Refs #248 *
 
 V1.34.9
 ------------------------------

diff --git a/dist/js/bootstrap-dialog.js b/dist/js/bootstrap-dialog.js
@@ -333,18 +333,20 @@
          * Will be removed in later version, after Bootstrap Modal >= 3.3.0, updating z-index is unnecessary.
          */
         updateZIndex: function () {
-            var zIndexBackdrop = 1040;
-            var zIndexModal = 1050;
-            var dialogCount = 0;
-            $.each(BootstrapDialog.dialogs, function (dialogId, dialogInstance) {
-                if (dialogInstance.isRealized() && dialogInstance.isOpened()) {
-                    dialogCount++;
-                }
-            });
-            var $modal = this.getModal();
-            var $backdrop = $modal.data('bs.modal').$backdrop;
-            $modal.css('z-index', zIndexModal + (dialogCount - 1) * 20);
-            $backdrop.css('z-index', zIndexBackdrop + (dialogCount - 1) * 20);
+            if (this.isOpened()) {
+                var zIndexBackdrop = 1040;
+                var zIndexModal = 1050;
+                var dialogCount = 0;
+                $.each(BootstrapDialog.dialogs, function (dialogId, dialogInstance) {
+                    if (dialogInstance.isRealized() && dialogInstance.isOpened()) {
+                        dialogCount++;
+                    }
+                });
+                var $modal = this.getModal();
+                var $backdrop = $modal.data('bs.modal').$backdrop;
+                $modal.css('z-index', zIndexModal + (dialogCount - 1) * 20);
+                $backdrop.css('z-index', zIndexBackdrop + (dialogCount - 1) * 20);
+            }
 
             return this;
         },
@@ -1240,11 +1242,11 @@
                 if (!dialog.getData('btnClicked') && dialog.isClosable() && typeof dialog.getData('callback') === 'function') {
                     hideIt = dialog.getData('callback')(false);
                 }
-                if(hideIt === false) {
+                if (hideIt === false) {
                     return false;
                 }
                 hideIt = this.onhide(dialog);
-                
+
                 return hideIt;
             }.bind({
                 onhide: dialog.options.onhide
@@ -1255,7 +1257,7 @@
                 if (!dialog.getData('btnClicked') && dialog.isClosable() && typeof dialog.getData('callback') === 'function') {
                     hideIt = dialog.getData('callback')(false);
                 }
-                
+
                 return hideIt;
             });
         }

diff --git a/dist/js/bootstrap-dialog.min.js b/dist/js/bootstrap-dialog.min.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "bootstrap3-dialog",
-  "version": "1.34.9",
+  "version": "1.35.0",
   "description": "Make use of Bootstrap Modal more monkey-friendly.",
   "private": true,
   "directories": {

diff --git a/src/js/bootstrap-dialog.js b/src/js/bootstrap-dialog.js
@@ -333,18 +333,20 @@
          * Will be removed in later version, after Bootstrap Modal >= 3.3.0, updating z-index is unnecessary.
          */
         updateZIndex: function () {
-            var zIndexBackdrop = 1040;
-            var zIndexModal = 1050;
-            var dialogCount = 0;
-            $.each(BootstrapDialog.dialogs, function (dialogId, dialogInstance) {
-                if (dialogInstance.isRealized() && dialogInstance.isOpened()) {
-                    dialogCount++;
-                }
-            });
-            var $modal = this.getModal();
-            var $backdrop = $modal.data('bs.modal').$backdrop;
-            $modal.css('z-index', zIndexModal + (dialogCount - 1) * 20);
-            $backdrop.css('z-index', zIndexBackdrop + (dialogCount - 1) * 20);
+            if (this.isOpened()) {
+                var zIndexBackdrop = 1040;
+                var zIndexModal = 1050;
+                var dialogCount = 0;
+                $.each(BootstrapDialog.dialogs, function (dialogId, dialogInstance) {
+                    if (dialogInstance.isRealized() && dialogInstance.isOpened()) {
+                        dialogCount++;
+                    }
+                });
+                var $modal = this.getModal();
+                var $backdrop = $modal.data('bs.modal').$backdrop;
+                $modal.css('z-index', zIndexModal + (dialogCount - 1) * 20);
+                $backdrop.css('z-index', zIndexBackdrop + (dialogCount - 1) * 20);
+            }
 
             return this;
         },
@@ -1240,11 +1242,11 @@
                 if (!dialog.getData('btnClicked') && dialog.isClosable() && typeof dialog.getData('callback') === 'function') {
                     hideIt = dialog.getData('callback')(false);
                 }
-                if(hideIt === false) {
+                if (hideIt === false) {
                     return false;
                 }
                 hideIt = this.onhide(dialog);
-                
+
                 return hideIt;
             }.bind({
                 onhide: dialog.options.onhide
@@ -1255,7 +1257,7 @@
                 if (!dialog.getData('btnClicked') && dialog.isClosable() && typeof dialog.getData('callback') === 'function') {
                     hideIt = dialog.getData('callback')(false);
                 }
-                
+
                 return hideIt;
             });
         }