diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js index 5b602c271fb..78f4c61b310 100644 --- a/ui/scripts/ui/dialog.js +++ b/ui/scripts/ui/dialog.js @@ -1045,11 +1045,9 @@ } }] }); - - $('button.ui-dialog-titlebar-close').remove(); - return cloudStack.applyDefaultZindexOnJqueryDialog($dialog); + + return cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton($dialog, 5001); } - return false; } }; diff --git a/ui/scripts/ui/utils.js b/ui/scripts/ui/utils.js index 895800cbfc4..ec2ecda6d7a 100644 --- a/ui/scripts/ui/utils.js +++ b/ui/scripts/ui/utils.js @@ -146,22 +146,17 @@ }); }; - var applyZindexOnJqueryDialog = function($dialog){ - var $dialogDiv = $dialog.closest('.ui-dialog'); - $dialogDiv.css('z-index', 5000); - return $dialogDiv; - }; - cloudStack.applyDefaultZindexOnJqueryDialog = applyZindexOnJqueryDialog; - - var applyZindexAndOverlayOnJqueryDialog = function($dialog){ - var $dialogDiv = applyZindexOnJqueryDialog($dialog); - return $dialogDiv.overlay(); - }; - cloudStack.applyDefaultZindexAndOverlayOnJqueryDialog = applyZindexAndOverlayOnJqueryDialog; - - var applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = function($dialog){ + var applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = function($dialog, customZindex){ + var defaultZindex = 5000; + if(!customZindex){ + customZindex = defaultZindex; + } $('button.ui-dialog-titlebar-close').remove() - return applyZindexAndOverlayOnJqueryDialog($dialog) + + var $dialogDiv = $dialog.closest('.ui-dialog'); + $dialogDiv.css('z-index', customZindex); + + return $dialogDiv.overlay(); }; cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton; })(jQuery, cloudStack);