mirrors/deluge
1
0
Fork 0
mirror of https://git.deluge-torrent.org/deluge synced 2025-04-21 03:54:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge changes into trunk

Browse source
This commit is contained in:
Damien Churchill 2009-10-20 21:44:27 +00:00
parent 9c491c13cc
commit 3f1d769ffc
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
deluge/ui/web/js/Deluge.MultiOptionsManager.js
View file

@ -75,7 +75,13 @@ Deluge.MultiOptionsManager = Ext.extend(Deluge.OptionsManager, {
*/
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 {