Changeset 5395 for trunk/www/exception/duplicate_wizard.jsp

Timestamp:

Aug 27, 2010, 2:55:56 PM (12 years ago)

Author:

Nicklas Nordborg

Message:

Fixes #738: Implement file upload as a pure servlet

It is not the file upload itself that is the real problem, it is the fact that the upload is sent to a hidden frame and that it is difficult to handle errors (eg. show them to the user). The new solution is to simply let the error be generated in the hidden frame and then use a javascript callback in the parent window to re-size the frames so that the upload-frame becomes visible instead.

I have also got rid of the non-ajax version of progress reporter since this could also cause problems. The progress reporting is no longer responsible for any error handling (since it is possible for an error to happen before the progress reporting infrastructure has been setup).

File:

• trunk/www/exception/duplicate_wizard.jsp (modified) (3 diffs)

trunk/www/exception/duplicate_wizard.jsp

@@ -48 +48 @@
 %>
 <base:page type="default" menu="exception" title="Another plug-in wizard is active">
-<base:head>
+<base:head scripts="exception.js">
   <script language="JavaScript">
-  function fixWindow()
-  {
-    if (window.opener != null)
-    {
-      // popup window --> Hide menubar
-      Main.hide('menubar');
-      var width = Main.getWindowWidth();
-      var height = Main.getWindowHeight();
-      if (height < 400) height = 400;
-      if (width < 600) width = 600; // >
-      window.resizeTo(width, height);
-    }
-    else
-    {
-      // Hide close button
-      Main.hide('close');
-      // If inside a second frameset, hide menubar
-      if (window.parent != window.top)
-      {
-        Main.hide('menubar');
-      }
-    }
-  }
   function goNext()
   {
@@ -82 +59 @@
   </script>
 </base:head>
-<base:body onload="fixWindow()">
+<base:body onload="Exception.fixWindow(false)">
 
   <div align="center">
@@ -93 +70 @@
   <tr>
     <td id="next" width="50%"><base:button onclick="goNext();" title="Continue" image="gonext.gif" /></td>
-    <td id="close" width="50%"><base:button onclick="window.close();" title="Cancel" /></td>
+    <td id="close" width="50%"><base:button onclick="window.top.close();" title="Cancel" /></td>
   </tr>
   </table>