Changeset 6309

Timestamp:

Aug 21, 2013, 1:42:30 PM (9 years ago)

Author:

Nicklas Nordborg

Message:

References #1729 and #1730. Fixed on exception handling pages.

Location:

trunk/www

Files:

• exception/duplicate_wizard.jsp (modified) (2 diffs)
• exception/exception.jsp (modified) (3 diffs)
• exception/invalid_data.jsp (modified) (2 diffs)
• exception/not_logged_in.jsp (modified) (1 diff)
• exception/permission_denied.jsp (modified) (2 diffs)
• exception/web.jsp (modified) (2 diffs)
• filemanager/upload/index.jsp (modified) (1 diff)
• filemanager/upload/upload.js (modified) (2 diffs)
• include/scripts/exception.js (modified) (3 diffs)

trunk/www/exception/duplicate_wizard.jsp

@@ -48 +48 @@
 %>
 <base:page type="popup" menu="exception" title="Another plug-in wizard is active">
-<base:head scripts="exception.js">
-  <script>
-  function goNext()
-  {
-    if (confirm('Are you sure? Unsaved settings in the other wizard will be lost.'))
-    {
-      location.replace(location.href + '&warnIfOpen=0');
-    }
-  }
-  </script>
-</base:head>
-<base:body onload="Exception.fixWindow(false)">
+<base:head scripts="exception.js" />
+<base:body>
 
   <h1>Another plug-in configuration wizard is open</h1>
@@ -72 +62 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button onclick="goNext();" title="Continue" image="gonext.png" />
-    <base:button onclick="window.top.close();" title="Cancel" />
+    <base:button id="continuePluginWizard" title="Continue" image="gonext.png" />
+    <base:button id="close" title="Cancel" />
   </base:buttongroup>
   

trunk/www/exception/exception.jsp

@@ -111 +111 @@
 <base:page type="default" menu="exception" title="Unexpected error">
 <base:head scripts="exception.js" styles="popup.css" />
-<base:body onload="Exception.fixWindow(true)">
+<base:body data-resize-if-popup="1">
   <h1><%=exceptionClassName + " on page "+request.getAttribute("javax.servlet.error.request_uri")%></h1>
+  
   <div class="content bottomborder" style="bottom: 3em;">
     <table class="fullform outlined topborder">
@@ -197 +198 @@
         }
         %>
-        <span id="more_detail">
-          <base:icon image="gonext.png" />
-          <a href="javascript:Main.show('error_detail');Main.hide('more_detail');"><%=st.length-i%> more...</a>
-        </span>
-      
+        <base:icon 
+          id="showMoreDetails"
+          data-show-id="error_detail"
+          image="gonext.png"><%=st.length-i%> more...</base:icon>
       </td>
     </table>
@@ -207 +207 @@
   
   <base:buttongroup subclass="dialogbuttons">
-    <base:button id="goback" onclick="<%="history.go(-1)"%>" title="Back"/>
-    <base:button id="close" onclick="<%="window.top.close()"%>" title="Close"/>
-    <base:button id="reportbug" onclick="<%="window.open('"+reportbuglink+"','Reportbug')"%>" 
-      title="Report bug&hellip;" image="bug.png"
-    visible="<%=HTML.isValidUrl(reportbuglink)%>"/>
+    <base:button id="goback" title="Back"/>
+    <base:button id="close" title="Close"/>
+    <base:button id="reportbug" title="Report bug&hellip;" image="bug.png"
+      data-report-link="<%=HTML.encodeTags(reportbuglink) %>"
+      visible="<%=HTML.isValidUrl(reportbuglink)%>"/>
   </base:buttongroup>
 

trunk/www/exception/invalid_data.jsp

@@ -60 +60 @@
 <base:page type="default" menu="exception" title="Invalid data">
 <base:head scripts="exception.js" styles="popup.css"/>
-<base:body onload="Exception.fixWindow(false)">
+<base:body>
   <h1><%=exceptionClassName + " on page "+request.getAttribute("javax.servlet.error.request_uri")%></h1>
 
@@ -70 +70 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button onclick="history.go(-1);" title="Back" />
-    <base:button onclick="window.top.close();" title="Close" />
+    <base:button id="goback" title="Back" />
+    <base:button id="close" title="Close" />
   </base:buttongroup>
 

trunk/www/exception/not_logged_in.jsp

@@ -51 +51 @@
 final String redirect = Values.getString((String)request.getAttribute("redirect"));
 %>
-<base:page type="default" menu="exception" title="">
+<base:page type="default" menu="exception" title="Not logged in">
 <base:head scripts="exception.js,/login.js" styles="login.css" />
-<base:body>
+<base:body data-resize-if-popup="1">
 
     <form action="<%=root%>login.jsp?again=1" method="post" name="login" target="Login">

trunk/www/exception/permission_denied.jsp

@@ -61 +61 @@
 <base:page type="default" menu="exception" title="Permission denied">
 <base:head scripts="exception.js" styles="popup.css"/>
-<base:body onload="Exception.fixWindow(false)">
+<base:body>
   <h1><%=exceptionClassName + " on page "+request.getAttribute("javax.servlet.error.request_uri")%></h1>
 
@@ -71 +71 @@
 
   <base:buttongroup subclass="dialogbuttons">
-    <base:button onclick="history.go(-1);" title="Back" />
-    <base:button onclick="window.top.close();" title="Close" />
+    <base:button id="goback" title="Back" />
+    <base:button id="close" title="Close" />
   </base:buttongroup>
 

trunk/www/exception/web.jsp

@@ -52 +52 @@
 <base:page type="<%=ex.getPageType()%>" menu="auto" title="<%=ex.getTitle()%>">
 <base:head scripts="exception.js" />
-<base:body onload="Exception.fixWindow(false)">
+<base:body>
 
   <h1><%=ex.getTitle()%></h1>
@@ -64 +64 @@
     </td></tr>
     </table>
-    
   </div>
   
   <base:buttongroup subclass="dialogbuttons">
-    <base:button id="goback" onclick="history.go(-1);" title="Back" />
-    <base:button id="close" onclick="window.top.close();" title="Close" />
+    <base:button id="goback" title="Back" />
+    <base:button id="close" title="Close" />
   </base:buttongroup>
   

trunk/www/filemanager/upload/index.jsp

@@ -153 +153 @@
   %>
   <base:page type="popup" title="<%=title%>" id="select-file">
-  <base:head scripts="~upload.js" styles="progressbar.css">
-    <script>
-    // Callback that shows the upload-frame in case of an error
-    function exceptionHandlerCallback(windowName)
-    {
-      if (windowName == 'upload')
-      {
-        Main.show('uploadForm');
-        Main.hide('progressForm');
-      }
-    }
-    </script>
-  </base:head>
-  <base:body>
+  <base:head scripts="~upload.js" styles="progressbar.css" />
+  <base:body data-notify-on-error="1">
   <div id="selectForm" class="absolutefull">
     <h1><%=title%> <base:help helpid="file.upload"/></h1>

trunk/www/filemanager/upload/upload.js

@@ -46 +46 @@
       // File
       Events.addEventHandler('the_file', 'change', upload.fileOnChange);
+      
+      // Error handling
+      Events.addEventHandler(document.body, 'base-notify', upload.onUploadError);
     }
     else if (pageId == 'upload-results')
@@ -258 +261 @@
     }
   }
+  
+  upload.onUploadError = function(event)
+  {
+    if (event.detail.errorWindow == 'upload')
+    {
+      Main.show('uploadForm');
+      Main.hide('progressForm');
+    }
+  }
 
   return upload;

trunk/www/include/scripts/exception.js

@@ -25 +25 @@
   @version 2.16
 */
-var Exception = new ExceptionClass(); 
+var Exception = function()
+{
+  var exception = {};
+  
+  exception.initPage = function()
+  {
+    var resizeIfPopup = Data.int(document.body, 'resize-if-popup', 0);
 
-function ExceptionClass()
-{
-  /*
-    Fix the error window by hiding some elements that shouldn't be visisible at
-    all times, resize the window, re-display the error message, etc...
+    exception.fixWindow(resizeIfPopup);
+    
+    Buttons.addClickHandler('close', App.closeWindow);
+    Buttons.addClickHandler('goback', exception.goBack);
+    Buttons.addClickHandler('reportbug', exception.reportBug);
+    Buttons.addClickHandler('showMoreDetails', exception.showMoreDetails);
+    Buttons.addClickHandler('continuePluginWizard', exception.continuePluginWizard);
+  }
   
-    @param resizeIfPopup If set, and the window is a popup window, it is resized to
-      at least 800x600
-  */
-  ExceptionClass.prototype.fixWindow = function(resizeIfPopup)
+  exception.fixWindow = function(resizeIfPopup)
   {
     var topWindow = window.top;
     var isPopup = topWindow.opener != null;
-    
-    if (history.length <= 1) // >
+    if (history.length <= 1)
     {
       Main.hide('goback');
@@ -52 +57 @@
       if (resizeIfPopup)
       {
-        var width = Main.getWindowWidth(topWindow);
-        var height = Main.getWindowHeight(topWindow);
-        if (height < 600) height = 600;
-        if (width < 800) width = 800;
-        topWindow.resizeTo(width, height);
+        var pos = App.getWindowPosition(topWindow);
+        if (pos.height < 600 || pos.width < 800)
+        {
+          topWindow.resizeTo(Math.max(800, pos.width), Math.max(600, pos.height));
+        }
       }
     }
@@ -69 +74 @@
       }
     }
-    if (topWindow.exceptionHandlerCallback) 
+    
+    var notify = Data.get(topWindow.document.body, 'notify-on-error');
+    if (notify)
     {
-      topWindow.exceptionHandlerCallback(window.name);
+      Events.sendCustomEvent(topWindow.document.body, 'base-notify', {'errorWindow': window.name});
+    }
+    /*
+    alert(notify);
+    if (topWindow != window)
+    {
+      alert(topWindow.exceptionHandlerCallback);
+      if (topWindow.exceptionHandlerCallback) 
+      {
+        topWindow.exceptionHandlerCallback(window.name);
+      }
+    }
+    */
+  }
+  
+  exception.goBack = function()
+  {
+    history.go(-1);
+  }
+  
+  exception.reportBug = function(event)
+  {
+    var reportLink = Data.get(event.currentTarget, 'report-link');
+    if (reportLink) window.open(reportLink, 'ReportBug');
+  }
+  
+  exception.showMoreDetails = function(event)
+  {
+    var id = Data.get(event.currentTarget, 'show-id');
+    Main.show(id);
+    Main.hide(event.currentTarget.id);
+  }
+  
+  exception.continuePluginWizard = function()
+  {
+    if (confirm('Are you sure? Unsaved settings in the other wizard will be lost.'))
+    {
+      location.replace(location.href + '&warnIfOpen=0');
     }
   }
 
-}
+  
+  return exception;
+}();
 
+Doc.onLoad(Exception.initPage);
+