diff options
| author | John McLear <john@mclear.co.uk> | 2013-03-16 17:57:23 +0000 |
|---|---|---|
| committer | John McLear <john@mclear.co.uk> | 2013-03-16 17:57:23 +0000 |
| commit | a1d9d27cde3bee416355222ec1988debfdc3d4c2 (patch) | |
| tree | fb1b257b809d325b9eaed8ac062c4429eb261c63 /src/static | |
| parent | 69a4ab76cfb4de059d3c5bc34f3d803bac718899 (diff) | |
| download | etherpad-lite-a1d9d27cde3bee416355222ec1988debfdc3d4c2.zip | |
much cleaner way of showing / hiding overlay
Diffstat (limited to 'src/static')
| -rw-r--r-- | src/static/js/pad_connectionstatus.js | 1 | ||||
| -rw-r--r-- | 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; |