cvs commit: jahia/core/src/webapp/jsp/jahia/administration work_in_progress.html

[Xavier Lawrence]

xlawrence    2005/12/15 15:51:05 CET

  Modified files:
    core/src/webapp/jsp/jahia/administration work_in_progress.html 
  Log:
  JAHIA-584
  added javascript checks to close the window
  
  Revision  Changes    Path
  1.7       +3 -0      
jahia/core/src/webapp/jsp/jahia/administration/work_in_progress.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/jahia/core/src/webapp/jsp/jahia/administration/work_in_progress.html.diff?r1=1.6&r2=1.7&f=h
  
  
  
  Index: work_in_progress.html
  ===================================================================
  RCS file: 
/home/cvs/repository/jahia/core/src/webapp/jsp/jahia/administration/work_in_progress.html,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- work_in_progress.html     12 Oct 2005 10:00:58 -0000      1.6
  +++ work_in_progress.html     15 Dec 2005 14:51:05 -0000      1.7
  @@ -8,6 +8,9 @@
               window.close();
           }
           function checkWorkInProgress() {
  +            if (! window.opener) window.close();
  +            if (! window.opener.location) window.close();
  +            if (! window.opener.document.mainForm) window.close();
               work_in_progress_oldUrl = window.opener.location.href;
               waitForCloseOpener();
           }