Permalink
Browse files

One last pass at reverting the Modalbox dialog in parallel with the A…

…jax request
  • Loading branch information...
1 parent 56519af commit 8a3294e9739b93bbabee577fb5537842bc890678 @hlship committed Apr 8, 2011
@@ -176,9 +176,3 @@ DIV.tx-multiselect .tx-input {
DIV.t-error-popup {
z-index: 20000;
}
-
-DIV.tx-lightbox-loading {
- padding: 1.5em;
- text-indent: -10000px;
- background: transparent url(spinner.gif) 50% 0 no-repeat;
-}
@@ -88,9 +88,6 @@ Tapx.extendInitializer(function() {
function lightbox(title, contentURL) {
- var animationComplete = false;
- var animationCompleteCallback = null;
-
function updateLightboxFromReply(reply) {
var inits = reply.inits;
reply.inits = null;
@@ -107,14 +104,15 @@ Tapx.extendInitializer(function() {
});
}
+ // Been experimenting with running the Modalbox loading animation in parallel
+ // with doing the Ajax, but Modalbox is a twisted singleton that causes some
+ // bad timing issues. Back to just running the (quick) Ajax request and then running
+ // the Modalbox animation.
+
Tapestry.ajaxRequest(contentURL, function(transport) {
var reply = transport.responseJSON;
- updateLightboxFromReply(reply);
- });
-
- Modalbox.show("<div class='tx-lightbox-loading'></div>", {
- title : title,
+ updateLightboxFromReply(reply);
});
}

0 comments on commit 8a3294e

Please sign in to comment.