sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

bitbake: toaster: alerts and modals Avoid modals and alerts overlaying each other 

Make sure that when we spawn a modal we clear any notifications and also
make sure that old notifications are cleared before showing a new one.

(Bitbake rev: c7f30a673ab973a2500092d2e981a47da05fbf12)

Signed-off-by: Michael Wood <michael.g.wood@intel.com>
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Michael Wood 2016-09-26 13:59:32 +03:00 committed by Richard Purdie
parent 0d70606022
commit d209f8b7af
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
bitbake/lib/toaster/toastergui/static/js/layerDepsModal.js
View File

@ -6,7 +6,12 @@
* addToProject: Whether to add layers to project on accept
* successAdd: function to run on success
*/
function showLayerDepsModal(layer, dependencies, title, body, addToProject, successAdd) {
function showLayerDepsModal(layer,
dependencies,
title,
body,
addToProject,
successAdd) {
if ($("#dependencies-modal").length === 0) {
$.get(libtoaster.ctx.htmlUrl + "/layer_deps_modal.html", function(html){
@ -43,7 +48,10 @@ function showLayerDepsModal(layer, dependencies, title, body, addToProject, succ
$("#dependencies-modal").data("deps", dependencies);
$('#dependencies-modal').modal('show');
/* Clear any alert notifications before showing the modal */
$(".alert").fadeOut(function(){
$('#dependencies-modal').modal('show');
});
/* Discard the old submission function */
$("#dependencies-modal-form").unbind('submit');

13
bitbake/lib/toaster/toastergui/static/js/libtoaster.js
View File

@ -342,10 +342,12 @@ var libtoaster = (function () {
}
function _showChangeNotification(message){
var alertMsg = $("#change-notification-msg");
$(".alert").fadeOut().promise().done(function(){
var alertMsg = $("#change-notification-msg");
alertMsg.html(message);
$("#change-notification, #change-notification *").fadeIn();
alertMsg.html(message);
$("#change-notification, #change-notification *").fadeIn();
});
}
function _createCustomRecipe(name, baseRecipeId, doneCb){
@ -716,6 +718,11 @@ $(document).ready(function() {
});
}
/* Make sure we don't have a notification overlay a modal */
$(".modal").on('show.bs.modal', function(){
$(".alert-dismissible").fadeOut();
});
if (libtoaster.debug) {
check_for_duplicate_ids();
} else {