summaryrefslogtreecommitdiff
path: root/roundcubemail/program/js/app.js
diff options
context:
space:
mode:
authorthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-06-01 17:05:18 +0000
committerthomasb <thomasb@208e9e7b-5314-0410-a742-e7e81cd9613c>2011-06-01 17:05:18 +0000
commitc4bba63a2d4b06fd620909ca25a1556fddfd48be (patch)
tree57485f1a7bd24c0178c79ed68f2d8edb71272f8b /roundcubemail/program/js/app.js
parentdce4c5bb18fb37eb97c3ea9a3c776b2151716dbc (diff)
Add collected text labels in one single function call
git-svn-id: https://svn.roundcube.net/trunk@4825 208e9e7b-5314-0410-a742-e7e81cd9613c
Diffstat (limited to 'roundcubemail/program/js/app.js')
-rw-r--r--roundcubemail/program/js/app.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/roundcubemail/program/js/app.js b/roundcubemail/program/js/app.js
index db79772a1..7878c9c4c 100644
--- a/roundcubemail/program/js/app.js
+++ b/roundcubemail/program/js/app.js
@@ -70,9 +70,12 @@ function rcube_webmail()
};
// add a localized label to the client environment
- this.add_label = function(key, value)
+ this.add_label = function(p, value)
{
- this.labels[key] = value;
+ if (typeof p == 'string')
+ this.labels[p] = value;
+ else if (typeof p == 'object')
+ $.extend(this.labels, p);
};
// add a button to the button list