--- loncom/html/res/adm/pages/menu.html 2003/04/30 21:26:47 1.96 +++ loncom/html/res/adm/pages/menu.html 2003/05/28 13:34:45 1.100 @@ -4,7 +4,7 @@ The LearningOnline Network with CAPA Remote Control // -// $Id: menu.html,v 1.96 2003/04/30 21:26:47 albertel Exp $ +// $Id: menu.html,v 1.100 2003/05/28 13:34:45 www Exp $ // // Copyright Michigan State University Board of Trustees // @@ -59,6 +59,7 @@ var currentSymb=''; var reloadSymb=''; var currentStale=1; var menucltim; +var noclient=0; var clockdelta=0; @@ -137,15 +138,24 @@ function advanceclock() { setTimeout('advanceclock();',1000); } +function windowloaded(wname) { + if (wname=='loncapaclient') { noclient=0; } +} + +function windowunloaded(wname) { + if (wname=='loncapaclient') { noclient=1;} +} + function windowcheck() { - if (clientwindow==null || clientwindow.closed) { + if (noclient || (clientwindow==null || clientwindow.closed)) { clientwindow=window.open("http://"+clienthost+"/",'', "height=400,width=440,"+ - "scrollbars=1,toolbar=1,status=1,resizable=1,location=1,"+ + "scrollbars=1,toolbar=1,status=1,resizable=1,location=1,menubar=1,"+ "left=190,top=15,screenX=190,screenY=15"); } clientwindow.name='loncapaclient'; clientwindow.menuwindow=self; + noclient=0; extenddispclose(); } @@ -278,6 +288,7 @@ function go(url) { currentURL = null; currentSymb= null; clientwindow.window.location.href="http://"+clienthost+url; + clientwindow.name='loncapaclient'; } }