etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix alert message in VM creation wizard (#2786) 

* Fix alert message in VM creation wizard

* Remove "var" keyword for customZindex variable

* Fix "cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton"
This commit is contained in:
Rafael Weingärtner 2018-08-10 10:20:59 -03:00 committed by GitHub
parent 5e48c0b4c9
commit 96d80b154b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ui/scripts/ui/dialog.js
View File

@ -1045,11 +1045,9 @@
}
}]
});
$('button.ui-dialog-titlebar-close').remove();
return cloudStack.applyDefaultZindexOnJqueryDialog($dialog);
return cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton($dialog, 5001);
}
return false;
}
};

25
ui/scripts/ui/utils.js
View File

@ -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);