amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-04-25 14:59:30 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: f4cb2b00dc9fb253acaaa97d083eec196e594fac

Browse Source 
Monotone-Revision: 698a166193d0842dd18a4a9d456862b37e990823

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2006-08-01T19:18:06
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2006-08-01 19:18:06 +00:00
parent 49bd0d1389
commit 1faa1b5bc0
2 changed files with 27 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -1,5 +1,9 @@
2006-08-01 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/SOGoUI/UIxComponent.m ([UIxComponent
-urlForResourceFilename:filename]): automatically return an empty
string whenever the filename passed as argument is nil.
* UI/WebServerResources/MailerUI.js: open the mailboxes with the
"desc" parameter set to 1 so that they are sorted in descending
order by default. Also, added "onHeaderClick()", triggered by

41
UI/SOGoUI/UIxComponent.m
View File

@@ -498,28 +498,33 @@ static BOOL uixDebugEnabled = NO;
WOResourceManager *rm;
NSBundle *pageBundle;
if (!pageToURL)
pageToURL = [[NSMutableDictionary alloc] initWithCapacity: 32];
url = [pageToURL objectForKey: filename];
if (!url)
if (filename)
{
rm = [self pageResourceManager];
page = [[self context] page];
pageBundle = [NSBundle bundleForClass: [page class]];
url = [rm urlForResourceNamed: filename
inFramework: [pageBundle bundlePath]
languages: nil
request: [[self context] request]];
if (!pageToURL)
pageToURL = [[NSMutableDictionary alloc] initWithCapacity: 32];
url = [pageToURL objectForKey: filename];
if (!url)
url = @"";
else
if ([url hasPrefix: @"http"])
url = [url hostlessURL];
[pageToURL setObject: url forKey: filename];
}
{
rm = [self pageResourceManager];
page = [[self context] page];
pageBundle = [NSBundle bundleForClass: [page class]];
url = [rm urlForResourceNamed: filename
inFramework: [pageBundle bundlePath]
languages: nil
request: [[self context] request]];
if (!url)
url = @"";
else
if ([url hasPrefix: @"http"])
url = [url hostlessURL];
[pageToURL setObject: url forKey: filename];
}
// NSLog (@"url for '%@': '%@'", filename, url);
}
else
url = @"";
return url;
}