You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2018/08/10 13:21:04 UTC
[cloudstack] branch master updated: Fix alert message in VM
creation wizard (#2786)
This is an automated email from the ASF dual-hosted git repository.
rafael pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git
The following commit(s) were added to refs/heads/master by this push:
new 96d80b1 Fix alert message in VM creation wizard (#2786)
96d80b1 is described below
commit 96d80b154b4a1c3433e27575ad2b918d2935d528
Author: Rafael Weingärtner <ra...@gmail.com>
AuthorDate: Fri Aug 10 10:20:59 2018 -0300
Fix alert message in VM creation wizard (#2786)
* Fix alert message in VM creation wizard
* Remove "var" keyword for customZindex variable
* Fix "cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton"
---
ui/scripts/ui/dialog.js | 6 ++----
ui/scripts/ui/utils.js | 23 +++++++++--------------
2 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index 5b602c2..78f4c61 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 895800c..ec2ecda 100644
--- a/ui/scripts/ui/utils.js
+++ b/ui/scripts/ui/utils.js
@@ -146,22 +146,17 @@
});
};
- var applyZindexOnJqueryDialog = function($dialog){
+ var applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = function($dialog, customZindex){
+ var defaultZindex = 5000;
+ if(!customZindex){
+ customZindex = defaultZindex;
+ }
+ $('button.ui-dialog-titlebar-close').remove()
+
var $dialogDiv = $dialog.closest('.ui-dialog');
- $dialogDiv.css('z-index', 5000);
- return $dialogDiv;
- };
- cloudStack.applyDefaultZindexOnJqueryDialog = applyZindexOnJqueryDialog;
-
- var applyZindexAndOverlayOnJqueryDialog = function($dialog){
- var $dialogDiv = applyZindexOnJqueryDialog($dialog);
+ $dialogDiv.css('z-index', customZindex);
+
return $dialogDiv.overlay();
};
- cloudStack.applyDefaultZindexAndOverlayOnJqueryDialog = applyZindexAndOverlayOnJqueryDialog;
-
- var applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = function($dialog){
- $('button.ui-dialog-titlebar-close').remove()
- return applyZindexAndOverlayOnJqueryDialog($dialog)
- };
cloudStack.applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton = applyDefaultZindexAndOverlayOnJqueryDialogAndRemoveCloseButton;
})(jQuery, cloudStack);