You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2015/01/31 02:09:23 UTC

git commit: updated refs/heads/volume-upload to 31dea7d

Repository: cloudstack
Updated Branches:
  refs/heads/volume-upload e08522dba -> 31dea7de2


volume-upload: UI > dialog widget - args.form.fileUpload.postUpload - fix a bug that loading image (spinning wheel, freezing screen) does not disappear after action succeeds/fails.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/31dea7de
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/31dea7de
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/31dea7de

Branch: refs/heads/volume-upload
Commit: 31dea7de2e3283b606de30500fbfad9028bd5ca4
Parents: e08522d
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jan 30 17:08:21 2015 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 30 17:08:21 2015 -0800

----------------------------------------------------------------------
 ui/scripts/ui/dialog.js | 6 ++++++
 1 file changed, 6 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/31dea7de/ui/scripts/ui/dialog.js
----------------------------------------------------------------------
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index e11843b..86703d5 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -738,6 +738,9 @@
                                                     });
 
                                                     $('div.overlay').remove();
+                                                    $form.find('.loading-overlay').remove();
+                                                    $('div.loading-overlay').remove();
+                                                    
                                                     $('.tooltip-box').remove();
                                                     $formContainer.remove();
                                                     $(this).dialog('destroy');
@@ -745,7 +748,10 @@
                                                     $('.hovered-elem').hide();
                                                 },
                                                 error: function(msg) {
+                                                	$('div.overlay').remove();
                                                     $form.find('.loading-overlay').remove();
+                                                    $('div.loading-overlay').remove();
+                                                    
                                                     cloudStack.dialog.error({ message: msg });
                                                 }
                                             }