From 078679843852e8531f907bafbab275a521dbb5e5 Mon Sep 17 00:00:00 2001
From: Thomas Bruederli <thomas@roundcube.net>
Date: Sat, 23 Nov 2013 10:59:32 -0500
Subject: [PATCH] Make local storage functions work before rcmail.init() was called
---
program/js/app.js | 17 ++++++++++++-----
1 files changed, 12 insertions(+), 5 deletions(-)
diff --git a/program/js/app.js b/program/js/app.js
index c9d0ab9..ac06df6 100644
--- a/program/js/app.js
+++ b/program/js/app.js
@@ -187,8 +187,6 @@
if (this.env.permaurl)
this.enable_command('permaurl', 'extwin', true);
- this.local_storage_prefix = 'roundcube.' + (this.env.user_id || 'anonymous') + '.';
-
switch (this.task) {
case 'mail':
@@ -7447,11 +7445,20 @@
setCookie(name, value, expires, this.env.cookie_path, this.env.cookie_domain, this.env.cookie_secure);
};
+ this.get_local_storage_prefix = function()
+ {
+ if (!this.local_storage_prefix)
+ this.local_storage_prefix = 'roundcube.' + (this.env.user_id || 'anonymous') + '.';
+
+ return this.local_storage_prefix;
+ };
+
// wrapper for localStorage.getItem(key)
this.local_storage_get_item = function(key, deflt, encrypted)
{
+
// TODO: add encryption
- var item = localStorage.getItem(this.local_storage_prefix + key);
+ var item = localStorage.getItem(this.get_local_storage_prefix() + key);
return item !== null ? JSON.parse(item) : (deflt || null);
};
@@ -7459,13 +7466,13 @@
this.local_storage_set_item = function(key, data, encrypted)
{
// TODO: add encryption
- return localStorage.setItem(this.local_storage_prefix + key, JSON.stringify(data));
+ return localStorage.setItem(this.get_local_storage_prefix() + key, JSON.stringify(data));
};
// wrapper for localStorage.removeItem(key)
this.local_storage_remove_item = function(key)
{
- return localStorage.removeItem(this.local_storage_prefix + key);
+ return localStorage.removeItem(this.get_local_storage_prefix() + key);
};
} // end object rcube_webmail
--
Gitblit v1.9.1