From 28a6cf54f3fcbc9af7ad27ccf5b28928aa94390f Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 30 Nov 2010 03:40:45 -0500 Subject: [PATCH] Modal dialog for the popup blocker warning --- webcit/static/modal.js | 6 ++++-- webcit/static/t/confirmlogoff.html | 2 +- webcit/static/t/paging/failed_hook.html | 4 +++- webcit/static/wclib.js | 2 +- 4 files changed, 9 insertions(+), 5 deletions(-) diff --git a/webcit/static/modal.js b/webcit/static/modal.js index f12aed225..45090b92c 100644 --- a/webcit/static/modal.js +++ b/webcit/static/modal.js @@ -69,10 +69,12 @@ if ( isSafari ) { // need to do some special stuff to handle MSIE. -var toggleModal = function () { +var toggleModal = function (b) { html.className=modalShowing?'':'modal'; - modalShowing = !modalShowing; + + modalShowing = b; + if (modalShowing) { dialog.focus(); } else if (focusedElement) { diff --git a/webcit/static/t/confirmlogoff.html b/webcit/static/t/confirmlogoff.html index b7127abf5..da5b4c534 100644 --- a/webcit/static/t/confirmlogoff.html +++ b/webcit/static/t/confirmlogoff.html @@ -2,7 +2,7 @@

diff --git a/webcit/static/t/paging/failed_hook.html b/webcit/static/t/paging/failed_hook.html index d814fcb6a..46d983c3d 100644 --- a/webcit/static/t/paging/failed_hook.html +++ b/webcit/static/t/paging/failed_hook.html @@ -1,5 +1,7 @@ diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index 597fdd1bd..9ec96b0e8 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -870,7 +870,7 @@ function ConfirmLogoff() { { method: 'get', onSuccess: function(cl_success) { - toggleModal(); + toggleModal(true); } } ); -- 2.30.2