diff --git a/SoObjects/SOGo/NSString+Utilities.m b/SoObjects/SOGo/NSString+Utilities.m index a0e672c1f..c3996e07f 100644 --- a/SoObjects/SOGo/NSString+Utilities.m +++ b/SoObjects/SOGo/NSString+Utilities.m @@ -161,12 +161,12 @@ static NSMutableCharacterSet *urlStartChars = nil; if (!urlNonEndingChars) { urlNonEndingChars = [NSMutableCharacterSet new]; - [urlNonEndingChars addCharactersInString: @"=,.:;&\t \r\n"]; + [urlNonEndingChars addCharactersInString: @"=,.:;&()\t \r\n"]; } if (!urlAfterEndingChars) { urlAfterEndingChars = [NSMutableCharacterSet new]; - [urlAfterEndingChars addCharactersInString: @"[]\t \r\n"]; + [urlAfterEndingChars addCharactersInString: @"()[]\t \r\n"]; } start = refRange.location; diff --git a/SoObjects/SOGo/SOGoFolder.m b/SoObjects/SOGo/SOGoFolder.m index ee66d7acb..91b10248e 100644 --- a/SoObjects/SOGo/SOGoFolder.m +++ b/SoObjects/SOGo/SOGoFolder.m @@ -197,7 +197,7 @@ if ([otherName isEqualToString: @"personal"]) comparison = NSOrderedDescending; else - comparison = [selfName compare: otherName]; + comparison = NSOrderedSame; } return comparison; diff --git a/UI/WebServerResources/ContactsUI.js b/UI/WebServerResources/ContactsUI.js index 20f0bb327..7385fbb05 100644 --- a/UI/WebServerResources/ContactsUI.js +++ b/UI/WebServerResources/ContactsUI.js @@ -582,7 +582,7 @@ function refreshContacts(contactId) { } function onAddressBookNew(event) { - createFolder(window.prompt(labels["Name of the Address Book"]), + createFolder(window.prompt(labels["Name of the Address Book"], ""), appendAddressBook); preventDefault(event); } @@ -607,6 +607,7 @@ function appendAddressBook(name, folder) { var contactFolders = $("contactFolders"); var items = contactFolders.childNodesWithTag("li"); var li = document.createElement("li"); + li = Element.extend(li); // Add the calendar to the proper place var i = getListIndexForFolder(items, owner, name); @@ -628,16 +629,6 @@ function appendAddressBook(name, folder) { return result; } -function newFolderCallback(http) { - if (http.readyState == 4 - && http.status == 201) { - var name = http.callbackData; - appendAddressBook(name, "/" + name); - } - else - log ("ajax problem 4:" + http.status); -} - function newUserFolderCallback(folderData) { var folder = $(folderData["folder"]); if (!folder)