From f303dff5341fcb0d4c39ea6da36ad6432b6f7c65 Mon Sep 17 00:00:00 2001 From: helge Date: Wed, 27 Oct 2004 20:20:50 +0000 Subject: [PATCH] disable popup git-svn-id: http://svn.opengroupware.org/SOGo/trunk@435 d1b88da0-ebda-0310-925b-ed51d893ca5b --- SOGo/UI/Mailer/ChangeLog | 4 +++ SOGo/UI/Mailer/UIxMailListView.wox | 4 ++- SOGo/UI/Mailer/UIxMailMoveToPopUp.m | 43 +++++++++++++++-------------- SOGo/UI/Mailer/Version | 2 +- 4 files changed, 30 insertions(+), 23 deletions(-) diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog index 87679576..9094d6f1 100644 --- a/SOGo/UI/Mailer/ChangeLog +++ b/SOGo/UI/Mailer/ChangeLog @@ -1,3 +1,7 @@ +2004-10-27 Helge Hess + + * disabled popup until it uses the proper tree (v0.9.53) + 2004-10-27 Marcus Mueller * UIxMailMoveToPopUp.[m|wox]: component which renders a popup diff --git a/SOGo/UI/Mailer/UIxMailListView.wox b/SOGo/UI/Mailer/UIxMailListView.wox index c11b5cd6..895406df 100644 --- a/SOGo/UI/Mailer/UIxMailListView.wox +++ b/SOGo/UI/Mailer/UIxMailListView.wox @@ -183,9 +183,10 @@ + + +--> diff --git a/SOGo/UI/Mailer/UIxMailMoveToPopUp.m b/SOGo/UI/Mailer/UIxMailMoveToPopUp.m index 14fc01ef..7fef97df 100644 --- 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 -#include +@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 aed4bf5f..ae9c2bde 100644 --- 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 -- 2.39.5