git-svn-id: http://svn.opengroupware.org/SOGo/inverse/trunk@1256 d1b88da0-ebda-0310...

diff --git a/UI/MailerUI/product.plist b/UI/MailerUI/product.plist
index 6f269fb35146e5089ae5fd0a291152c0efed5876..0c024e62f3d5f8b292a0e5bcf9670bf583c3c131 100644 (file)
--- a/UI/MailerUI/product.plist
+++ b/UI/MailerUI/product.plist
@@ -84,6 +84,10 @@
        };
       };
       methods = {
+       view = {
+         protectedBy = "View";
+         pageName    = "UIxMailListView";
+       };
        subscribe = {
          protectedBy = "<public>";
          actionClass = "UIxMailFolderActions";
@@ -99,10 +103,6 @@
          actionClass = "UIxMailFolderActions";
          actionName = "quotas";
        };
-       view = {
-         protectedBy = "View";
-         pageName    = "UIxMailListView";
-       };
        ajax = {
          protectedBy = "View";
          pageName    = "UIxMailAjaxRequest";
@@ -378,16 +378,6 @@
                    );
        };
       };
-      methods = {
-       view = {
-         protectedBy = "View";
-         pageName    = "UIxMailListView";
-       };
-       getMail = {
-         protectedBy = "View";
-         pageName    = "UIxMailListView";
-       };
-      };
     };
 
     SOGoDraftObject = {
@@ -398,6 +388,10 @@
        };
       };
       methods = {
+       view = {
+         protectedBy = "View";
+         pageName    = "UIxMailEditor";
+       };
        edit = {
          protectedBy = "View";
          pageName    = "UIxMailEditor";

diff --git a/UI/Templates/UIxPageFrame.wox b/UI/Templates/UIxPageFrame.wox
index 9e38a12179ad32ce9778effbdb42d9b087818ee6..828487d20890e1d01e1dc9b5b0789bafbcd75668 100644 (file)
--- a/UI/Templates/UIxPageFrame.wox
+++ b/UI/Templates/UIxPageFrame.wox
@@ -66,6 +66,8 @@
          
          <div id="pageContent"><var:component-content/></div>
 
+         <div id="javascriptSafetyNet"><!-- space --></div>
+
          <script type="text/javascript">
            var ApplicationBaseURL = '<var:string value="applicationPath" />';
            var ResourcesURL = '/SOGo.woa/WebServerResources';
@@ -95,6 +97,7 @@
          <var:foreach list="additionalJSFiles" item="item"
            ><script type="text/javascript" var:src="item"><!-- space --></script>
          </var:foreach>
+         <script type="text/javascript">addEvent(window, 'load', onFinalLoadHandler);</script>
         </var:if>
         <var:if condition="isCompatibleBrowser" const:negate="YES">
          <div id="loginScreen">

diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 2f742cacf60e4cab31b437d22d5aa3ad2b8091c4..d5c1c529166e6a4bd1586003b62f39a0e8c8f862 100644 (file)
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -503,6 +503,14 @@ INPUT#searchValue
   background-position: 2px 2px;
   color: #aaa; }
 
+DIV#javascriptSafetyNet
+{ position: absolute;
+  background-color: transparent;
+  left: 0px;
+  right: 0px;
+  top: 0px;
+  bottom: 0px; }
+
 DIV.javascriptPopupBackground
 { position: absolute;
   background-color: #999;

diff --git a/UI/WebServerResources/generic.js b/UI/WebServerResources/generic.js
index 47c0975313fcc64cb3d2b8cd9abbd1b0ed7601f2..8150991ee6a3dc24cab4da4c4a146dd608b40242 100644 (file)
--- a/UI/WebServerResources/generic.js
+++ b/UI/WebServerResources/generic.js
@@ -1437,6 +1437,12 @@ function createFolderCallback(http) {
   }
 }
 
+function onFinalLoadHandler(event) {
+  var safetyNet = $("javascriptSafetyNet");
+  if (safetyNet)
+    safetyNet.parentNode.removeChild(safetyNet);
+}
+
 addEvent(window, 'load', onLoadHandler);
 
 function parent$(element) {