Author: damoxc
Revision: 5849
Log:
merge changes into trunk
Diff:
Modified: trunk/deluge/ui/web/js/Deluge.MultiOptionsManager.js
===================================================================
--- trunk/deluge/ui/web/js/Deluge.MultiOptionsManager.js 2009-10-20
21:32:32 UTC (rev 5848)
+++ trunk/deluge/ui/web/js/Deluge.MultiOptionsManager.js 2009-10-20
21:44:27 UTC (rev 5849)
@@ -75,7 +75,13 @@
*/
get: function() {
var id = arguments[0];
- if (arguments.length == 2) {
+ if (arguments.length == 1) {
+ var options = {};
+ for (var option in this.options) {
+ options[option] = (this.isDirty(id, option)) ?
this.changed[id][option] : this.getDefault(id, option);
+ }
+ return options;
+ } else if (arguments.length == 2) {
var option = arguments[1];
return (this.isDirty(id, option)) ?
this.changed[id][option] : this.getDefault(id, option);
} else {
--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups
"deluge-commit" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to
[email protected]
For more options, visit this group at
http://groups.google.com/group/deluge-commit?hl=en
-~----------~----~----~----~------~----~------~--~---
