From 69a4ab76cfb4de059d3c5bc34f3d803bac718899 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 16 Mar 2013 17:50:53 +0000 Subject: [PATCH 1/2] hide modal once reconnect is good --- src/static/js/pad_modals.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index 0292e048..0013e899 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -49,7 +49,7 @@ var padmodals = (function() }, duration); }, hideOverlay: function(duration) { - $("#overlay").animate( + $("#overlay").hide().css( { 'opacity': 0 }, duration, function() From a1d9d27cde3bee416355222ec1988debfdc3d4c2 Mon Sep 17 00:00:00 2001 From: John McLear Date: Sat, 16 Mar 2013 17:57:23 +0000 Subject: [PATCH 2/2] much cleaner way of showing / hiding overlay --- src/static/js/pad_connectionstatus.js | 1 - src/static/js/pad_modals.js | 16 ++-------------- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/src/static/js/pad_connectionstatus.js b/src/static/js/pad_connectionstatus.js index 2d9354ab..862d5fd1 100644 --- a/src/static/js/pad_connectionstatus.js +++ b/src/static/js/pad_connectionstatus.js @@ -76,7 +76,6 @@ var padconnectionstatus = (function() }, isFullyConnected: function() { - padmodals.hideOverlay(); return status.what == 'connected'; }, getStatus: function() diff --git a/src/static/js/pad_modals.js b/src/static/js/pad_modals.js index 0013e899..39094a7e 100644 --- a/src/static/js/pad_modals.js +++ b/src/static/js/pad_modals.js @@ -40,22 +40,10 @@ var padmodals = (function() }); }, showOverlay: function(duration) { - $("#overlay").show().css( - { - 'opacity': 0 - }).animate( - { - 'opacity': 1 - }, duration); + $("#overlay").show(); }, hideOverlay: function(duration) { - $("#overlay").hide().css( - { - 'opacity': 0 - }, duration, function() - { - $("#modaloverlay").hide(); - }); + $("#overlay").hide(); } }; return self;