diff options
| author |   Michael Wood <michael.g.wood@intel.com> | 2016-09-26 13:59:32 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2016-09-28 10:45:10 +0100 |
| commit | c7f30a673ab973a2500092d2e981a47da05fbf12 (patch) | |
| tree | bc61a80a9ff24bc49fc2760011b526c51faaea18 | |
| parent | e1cca28826dfa66d905dd4daf9964564c355207e (diff) | |
| download | bitbake-c7f30a673ab973a2500092d2e981a47da05fbf12.tar.gz | |
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.
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>
| -rw-r--r-- | lib/toaster/toastergui/static/js/layerDepsModal.js | 12 | ||||
| -rw-r--r-- | lib/toaster/toastergui/static/js/libtoaster.js | 13 |
2 files changed, 20 insertions, 5 deletions
diff --git a/lib/toaster/toastergui/static/js/layerDepsModal.js b/lib/toaster/toastergui/static/js/layerDepsModal.js index b79049e98..e9622243a 100644 --- a/lib/toaster/toastergui/static/js/layerDepsModal.js +++ b/lib/toaster/toastergui/static/js/layerDepsModal.js @@ -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'); diff --git a/lib/toaster/toastergui/static/js/libtoaster.js b/lib/toaster/toastergui/static/js/libtoaster.js index 8e2221d2a..0832ba40c 100644 --- a/lib/toaster/toastergui/static/js/libtoaster.js +++ b/lib/toaster/toastergui/static/js/libtoaster.js @@ -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 { |