amorfo77/sogo
1
0
Fork 0
mirror of https://github.com/inverse-inc/sogo.git synced 2026-08-19 13:43:22 +00:00
Code Issues Projects Releases Wiki Activity

Monotone-Parent: e0221240c98c353cd78f1dea976887fc91420de9

Browse Source 
Monotone-Revision: 0a7b2afa74ab092109cffa4ccc0c67371a5e313a

Monotone-Author: wsourdeau@inverse.ca
Monotone-Date: 2008-12-19T17:23:31
Monotone-Branch: ca.inverse.sogo
This commit is contained in:
Wolfgang Sourdeau
2008-12-19 17:23:31 +00:00
parent 109d1b65f6
commit 1d5aec5e3a
6 changed files with 51 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ChangeLog
+7
View File
@@ -1,3 +1,10 @@
2008-12-19 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* UI/Common/UIxPageFrame.m ([UIxPageFrame -userSettings]): new
accessor method to avoid loading the user settings with an
additional json request.
([UIxPageFrame -userDefaults]): same as above for user defaults.
2008-12-17 Wolfgang Sourdeau <wsourdeau@inverse.ca>
* SoObjects/SOGo/SOGoParentFolder.m ([SOGoParentFolder
UI/Common/UIxPageFrame.m
+28
View File
@@ -397,6 +397,34 @@
return language;
}
- (NSString *) userSettings
{
NSUserDefaults *userSettings;
NSString *jsonResult;
userSettings = [[context activeUser] userSettings];
if (userSettings)
jsonResult = [userSettings jsonRepresentation];
else
jsonResult = @"{}";
return jsonResult;
}
- (NSString *) userDefaults
{
NSUserDefaults *userDefaults;
NSString *jsonResult;
userDefaults = [[context activeUser] userDefaults];
if (userDefaults)
jsonResult = [userDefaults jsonRepresentation];
else
jsonResult = @"{}";
return jsonResult;
}
/* browser/os identification */
- (BOOL) isCompatibleBrowser
UI/Templates/UIxPageFrame.wox
+5 -3
View File
@@ -108,9 +108,11 @@
</var:if>
<var:if condition="shortUserNameForDisplay" const:value="anonymous"
const:negate="YES"
>var UserFolderURL = '<var:string value="userFolderPath" />';
var UserLogin = '<var:string value="shortUserNameForDisplay" />';
var UserLanguage = '<var:string value="userLanguage" />';</var:if>
>var UserFolderURL = '<var:string value="userFolderPath" const:escapeHTML="NO"/>';
var UserLogin = '<var:string value="shortUserNameForDisplay" const:escapeHTML="NO"/>';
var UserLanguage = '<var:string value="userLanguage" const:escapeHTML="NO"/>';
var UserSettings = <var:string value="userSettings" const:escapeHTML="NO"/>;
var UserDefaults = <var:string value="userDefaults" const:escapeHTML="NO"/>;</var:if>
<var:string value="commonLocalizableStrings" const:escapeHTML="NO"/>
<var:string value="productLocalizableStrings" const:escapeHTML="NO"/>
</script>
UI/WebServerResources/MailerUI.js
+3 -3
View File
@@ -583,7 +583,7 @@ function messageListCallback(http) {
var div = $('mailboxContent');
var table = $('messageList');
var columnsOrder = userSettings["SOGoMailListViewColumnsOrder"];
var columnsOrder = UserSettings["SOGoMailListViewColumnsOrder"];
if ( typeof(columnsOrder) == "undefined" ) {
columnsOrder = defaultColumnsOrder;
}
@@ -1363,7 +1363,7 @@ function configureMessageListBodyEvents(table) {
// 4 => Unread
// 5 => Date
// 6 => Priority
var columnsOrder = userSettings["SOGoMailListViewColumnsOrder"];
var columnsOrder = UserSettings["SOGoMailListViewColumnsOrder"];
if ( typeof(columnsOrder) == "undefined" ) {
columnsOrder = defaultColumnsOrder;
}
@@ -1474,7 +1474,7 @@ function initMailer(event) {
}
function initMessageCheckTimer() {
var messageCheck = userDefaults["MessageCheck"];
var messageCheck = UserDefaults["MessageCheck"];
if (messageCheck && messageCheck != "manually") {
var interval;
if (messageCheck == "once_per_hour")
UI/WebServerResources/UIxMailEditor.js
+3 -3
View File
@@ -312,7 +312,7 @@ function onTextIEUpdateCursorPos(event) {
function onTextFirstFocus() {
var content = this.getValue();
var replyPlacement = userDefaults["ReplyPlacement"];
var replyPlacement = UserDefaults["ReplyPlacement"];
if (replyPlacement == "above") {
this.insertBefore(document.createTextNode("\r\r"), this.lastChild);
@@ -547,7 +547,7 @@ function initMailEditor() {
if (sigLimit > -1)
MailEditor.signatureLength = (textContent.length - sigLimit);
}
if (userDefaults["ReplyPlacement"] != "above") {
if (UserDefaults["ReplyPlacement"] != "above") {
textarea.scrollTop = textarea.scrollHeight;
}
textarea.observe("focus", onTextFirstFocus);
@@ -655,7 +655,7 @@ function lineBreakCount(str){
function hasSignature() {
try {
return(userDefaults.MailAccounts[0].identities[0].signature.length > 0);
return(UserDefaults.MailAccounts[0].identities[0].signature.length > 0);
} catch(e) {
return false;
}
UI/WebServerResources/generic.js
+5 -11
View File
@@ -38,9 +38,6 @@ var lastClickedRow = -1;
// logArea = null;
var allDocumentElements = null;
var userDefaults = null;
var userSettings = null;
// Ajax requests counts
var activeAjaxRequests = 0;
var removeFolderRequestCount = 0;
@@ -1402,7 +1399,7 @@ function indexColor(number) {
return color;
}
function loadPreferences() {
function reloadPreferences() {
var url = UserFolderURL + "jsonDefaults";
var http = createHTTPClient();
http.open("GET", url, false);
@@ -1410,9 +1407,9 @@ function loadPreferences() {
if (http.status == 200) {
if (http.responseText.length > 0)
userDefaults = http.responseText.evalJSON(true);
UserDefaults = http.responseText.evalJSON(true);
else
userDefaults = {};
UserDefaults = {};
}
url = UserFolderURL + "jsonSettings";
@@ -1420,16 +1417,13 @@ function loadPreferences() {
http.send("");
if (http.status == 200) {
if (http.responseText.length > 0)
userSettings = http.responseText.evalJSON(true);
UserSettings = http.responseText.evalJSON(true);
else
userSettings = {};
UserSettings = {};
}
}
function onLoadHandler(event) {
if (typeof UserLogin != "undefined"
&& !(UserLogin == "" || UserLogin == "wrongusernamepassword"))
loadPreferences();
queryParameters = parseQueryParameters('' + window.location);
if (!$(document.body).hasClassName("popup")) {
initLogConsole();