merge of '2a121cef9785165904cbe9effa330ad47ba45099'
and '9f129d083b11ce7ac964a083c351d2a15f16fbdb' Monotone-Parent: 2a121cef9785165904cbe9effa330ad47ba45099 Monotone-Parent: 9f129d083b11ce7ac964a083c351d2a15f16fbdb Monotone-Revision: ef0808300fb0a2f855c131c8d4958cef75bb1a1c Monotone-Author: wsourdeau@inverse.ca Monotone-Date: 2010-08-11T13:33:02 Monotone-Branch: ca.inverse.sogomaint-2.0.2
commit
0c4d4b099e
12
ChangeLog
12
ChangeLog
|
@ -1,3 +1,9 @@
|
|||
2010-08-11 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/Common/UIxPageFrame.m (_dictionaryWithKeys:fromSource:):
|
||||
set an NSNull as value for keys which return no results, in order
|
||||
to avoid an NSInvalidArgumentException.
|
||||
|
||||
2010-08-10 Francis Lachapelle <flachapelle@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/generic.js (showAlertDialog): new function
|
||||
|
@ -5,6 +11,12 @@
|
|||
|
||||
2010-08-09 Wolfgang Sourdeau <wsourdeau@inverse.ca>
|
||||
|
||||
* UI/WebServerResources/MailerUI.js (openMailbox): removed the
|
||||
"updateStatus" parameter, which is never used.
|
||||
|
||||
* UI/WebServerResources/generic.js (log): fixed handling of
|
||||
messages ending with "\n".
|
||||
|
||||
* UI/Common/UIxPageFrame.m (-setUserDefaultsKeys:)
|
||||
(-hasUserDefaultsKeys, -setUserSettingsKeys:)
|
||||
(-hasUserSettingsKeys): new accessor for determining explicitly
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
*/
|
||||
|
||||
#import <Foundation/NSEnumerator.h>
|
||||
#import <Foundation/NSNull.h>
|
||||
#import <Foundation/NSString.h>
|
||||
|
||||
#import <NGObjWeb/WOResourceManager.h>
|
||||
|
@ -465,6 +466,10 @@
|
|||
NSString *key;
|
||||
int count, max;
|
||||
NSMutableDictionary *dict;
|
||||
NSNull *nsNull;
|
||||
id value;
|
||||
|
||||
nsNull = [NSNull null];
|
||||
|
||||
max = [keys count];
|
||||
|
||||
|
@ -472,8 +477,10 @@
|
|||
for (count = 0; count < max; count++)
|
||||
{
|
||||
key = [keys objectAtIndex: count];
|
||||
[dict setObject: [source objectForKey: key]
|
||||
forKey: key];
|
||||
value = [source objectForKey: key];
|
||||
if (!value)
|
||||
value = nsNull;
|
||||
[dict setObject: value forKey: key];
|
||||
}
|
||||
|
||||
return [dict jsonRepresentation];
|
||||
|
|
|
@ -622,7 +622,7 @@ function composeNewMessage() {
|
|||
}
|
||||
}
|
||||
|
||||
function openMailbox(mailbox, reload, updateStatus) {
|
||||
function openMailbox(mailbox, reload) {
|
||||
if (mailbox != Mailer.currentMailbox || reload) {
|
||||
var url = ApplicationBaseURL + encodeURI(mailbox);
|
||||
var urlParams = new Hash();
|
||||
|
@ -691,9 +691,6 @@ function openMailbox(mailbox, reload, updateStatus) {
|
|||
loadMessage(currentMessage);
|
||||
}
|
||||
}
|
||||
|
||||
if (updateStatus != false)
|
||||
getStatusFolders();
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1672,7 +1669,7 @@ function refreshContacts() {
|
|||
|
||||
function openInbox(node) {
|
||||
var done = false;
|
||||
openMailbox(node.parentNode.getAttribute("dataname"), false, false);
|
||||
openMailbox(node.parentNode.getAttribute("dataname"), false);
|
||||
var tree = $("mailboxTree");
|
||||
tree.selectedEntry = node;
|
||||
node.selectElement();
|
||||
|
|
|
@ -772,7 +772,7 @@ function log(message) {
|
|||
return;
|
||||
}
|
||||
if (message[message.length-1] == "\n") {
|
||||
message = message.substr(0, message.length-2);
|
||||
message = message.substr(0, message.length-1);
|
||||
}
|
||||
var lines = message.split("\n");
|
||||
for (var i = 0; i < lines.length; i++) {
|
||||
|
|
Loading…
Reference in New Issue