Skip to content

Commit 96d80b1

Browse files
Fix alert message in VM creation wizard (#2786)
* Fix alert message in VM creation wizard * Remove "var" keyword for customZindex variable * Fix "cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton"
1 parent 5e48c0b commit 96d80b1

2 files changed

Lines changed: 11 additions & 18 deletions

File tree

ui/scripts/ui/dialog.js

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1045,11 +1045,9 @@
10451045
}
10461046
}]
10471047
});
1048-
1049-
$('button.ui-dialog-titlebar-close').remove();
1050-
return cloudStack.applyDefaultZindexOnJqueryDialog($dialog);
1048+
1049+
return cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton($dialog, 5001);
10511050
}
1052-
10531051
return false;
10541052
}
10551053
};

ui/scripts/ui/utils.js

Lines changed: 9 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -146,22 +146,17 @@
146146
});
147147
};
148148

149-
var applyZindexOnJqueryDialog = function($dialog){
149+
var applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = function($dialog, customZindex){
150+
var defaultZindex = 5000;
151+
if(!customZindex){
152+
customZindex = defaultZindex;
153+
}
154+
$('button.ui-dialog-titlebar-close').remove()
155+
150156
var $dialogDiv = $dialog.closest('.ui-dialog');
151-
$dialogDiv.css('z-index', 5000);
152-
return $dialogDiv;
153-
};
154-
cloudStack.applyDefaultZindexOnJqueryDialog = applyZindexOnJqueryDialog;
155-
156-
var applyZindexAndOverlayOnJqueryDialog = function($dialog){
157-
var $dialogDiv = applyZindexOnJqueryDialog($dialog);
157+
$dialogDiv.css('z-index', customZindex);
158+
158159
return $dialogDiv.overlay();
159160
};
160-
cloudStack.applyDefaultZindexAndOverlayOnJqueryDialog = applyZindexAndOverlayOnJqueryDialog;
161-
162-
var applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = function($dialog){
163-
$('button.ui-dialog-titlebar-close').remove()
164-
return applyZindexAndOverlayOnJqueryDialog($dialog)
165-
};
166161
cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton;
167162
})(jQuery, cloudStack);

0 commit comments

Comments
 (0)