disable popup

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@435 d1b88da0-ebda-0310-925b-ed51d893ca5b

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index 876795763c66aa69328ec046b6d2c81ed4c7709a..9094d6f1892c08a9c69941578e24a7208d1a453c 100644 (file)
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,3 +1,7 @@
+2004-10-27  Helge Hess  <helge.hess@opengroupware.org>
+
+       * disabled popup until it uses the proper tree (v0.9.53)
+
 2004-10-27  Marcus Mueller  <znek@mulle-kybernetik.com>
 
        * UIxMailMoveToPopUp.[m|wox]: component which renders a popup

diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox
index c11b5cd62b17ba0e8fef2300a15543c718f87344..895406df797faa3755d32cb1a4f9f5362493c76b 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailListView.wox
+++ b/SOGo/UI/Mailer/UIxMailListView.wox
@@ -183,9 +183,10 @@
             </td>
           </tr>
         </var:foreach>
+
+<!-- TODO: fix used tree, treeNavigationNodes is the _wrong_ choice
         <tr class="tableview">
           <td colspan="6" class="tbtv_actcell">
-            <!-- actions -->
             <var:component className="UIxMailMoveToPopUp"
                            const:identifier="moveto"
                            const:callback="moveTo"
@@ -193,6 +194,7 @@
             />
           </td>
         </tr>
+-->
       </table>
       <span id="selected_uids" style="visibility: hidden;">
       </span>

diff --git a/SOGo/UI/Mailer/UIxMailMoveToPopUp.m b/SOGo/UI/Mailer/UIxMailMoveToPopUp.m
index 14fc01efebebf62e0b8e0c4d6a71d352c434b461..7fef97df7d76e0b83740bc9ab8d13a67ec53dbcf 100644 (file)
--- a/SOGo/UI/Mailer/UIxMailMoveToPopUp.m
+++ b/SOGo/UI/Mailer/UIxMailMoveToPopUp.m
@@ -1,7 +1,7 @@
 /*
  Copyright (C) 2000-2004 SKYRIX Software AG
  
- This file is part of OGo
+ This file is part of OpenGroupware.org.
  
  OGo is free software; you can redistribute it and/or modify it under
  the terms of the GNU Lesser General Public License as published by the
@@ -20,23 +20,25 @@
  */
 // $Id$
 
+#include <NGObjWeb/WOComponent.h>
 
-#include <NGObjWeb/NGObjWeb.h>
+@class NSString;
 
 @interface UIxMailMoveToPopUp : WOComponent
 {
   NSString *identifier;
   NSString *callback;
-  id rootNodes;
-  id item;
+  id       rootNodes;
+  id       item;
 }
 
 - (NSString *)itemDisplayString;
 - (NSString *)itemURL;
   
 - (void)_appendEntriesFromNodeDict:(NSDictionary *)_dict
-                            toList:(NSMutableArray *)_list
-                        withPrefix:(NSString *)_pathPrefix;
+  toList:(NSMutableArray *)_list
+  withPrefix:(NSString *)_pathPrefix;
+
 @end
 
 #include "common.h"
@@ -84,6 +86,7 @@
   NSDictionary *dict;
 
   r = [NSMutableArray arrayWithCapacity:10];
+  
   /* INBOX node */
   dict = [[self->rootNodes objectForKey:@"children"] objectAtIndex:0];
   [self _appendEntriesFromNodeDict:dict toList:r withPrefix:nil];
@@ -91,29 +94,29 @@
 }
 
 - (void)_appendEntriesFromNodeDict:(NSDictionary *)_dict
-                            toList:(NSMutableArray *)_list
-                        withPrefix:(NSString *)_pathPrefix
+  toList:(NSMutableArray *)_list
+  withPrefix:(NSString *)_pathPrefix
 {
   NSMutableDictionary *e;
   NSString *title, *link;
-  NSArray *children;
+  NSArray  *children;
   unsigned count, i;
 
   title = [_dict objectForKey:@"title"];
-  link = [_dict objectForKey:@"link"];
+  link  = [_dict objectForKey:@"link"];
+  
   e = [[NSMutableDictionary alloc] initWithCapacity:2];
-  if(!_pathPrefix)
-    _pathPrefix = title;
-  else
-    _pathPrefix = [NSString stringWithFormat:@"%@.%@", _pathPrefix, title];
+  _pathPrefix = (_pathPrefix == nil)
+    ? title
+    : [NSString stringWithFormat:@"%@.%@", _pathPrefix, title];
   [e setObject:_pathPrefix forKey:@"title"];
-  [e setObject:link forKey:@"link"];
+  [e setObject:link        forKey:@"link"];
   [_list addObject:e];
-  [e release];
+  [e release]; e = nil;
   
   children = [_dict objectForKey:@"children"];
   count = [children count];
-  for(i = 0; i < count; i++) {
+  for (i = 0; i < count; i++) {
     NSDictionary *dict;
     
     dict = [children objectAtIndex:i];
@@ -140,9 +143,7 @@
 - (NSString *)selectItemJS {
   static NSString *selectJS = \
     @"javascript:if(!this.hasAttribute('disabled')) %@('%@');";
-  return [NSString stringWithFormat:selectJS,
-    self->callback,
-    [self itemURL]];
+  return [NSString stringWithFormat:selectJS, self->callback, [self itemURL]];
 }
 
-@end
+@end /* UIxMailMoveToPopUp */

diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index aed4bf5f71b371b23ba0382f0854b8b39b99fcc3..ae9c2bdeb0538eec22d28d56cebbe92e325054bb 100644 (file)
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # $Id$
 
-SUBMINOR_VERSION:=52
+SUBMINOR_VERSION:=53
 
 # v0.9.50 requires NGMime   v4.3.190
 # v0.9.43 requires NGObjWeb v4.3.73