summaryrefslogtreecommitdiff
path: root/program/js
diff options
context:
space:
mode:
authorthomascube <thomas@roundcube.net>2011-06-01 17:05:18 +0000
committerthomascube <thomas@roundcube.net>2011-06-01 17:05:18 +0000
commit4dcd437adeeae71336760a4ce9a30d7a56500942 (patch)
tree1866dde3e417ef4173e6745b08574e1f3cc6fa45 /program/js
parent3cacf941fa30e8c02f3f7aebcc8747036d0d8d20 (diff)
Add collected text labels in one single function call
Diffstat (limited to 'program/js')
-rw-r--r--program/js/app.js7
1 files changed, 5 insertions, 2 deletions
diff --git a/program/js/app.js b/program/js/app.js
index db79772a1..7878c9c4c 100644
--- a/program/js/app.js
+++ b/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