diff --git a/deluge/ui/web/js/deluge-all/.order b/deluge/ui/web/js/deluge-all/.order index 7c2a1533d..4b6be4373 100644 --- a/deluge/ui/web/js/deluge-all/.order +++ b/deluge/ui/web/js/deluge-all/.order @@ -1 +1,2 @@ + OptionsManager.js ++ StatusbarMenu.js diff --git a/deluge/ui/web/js/deluge-all/Menus.js b/deluge/ui/web/js/deluge-all/Menus.js index 37041e5fc..c01fbfa11 100644 --- a/deluge/ui/web/js/deluge-all/Menus.js +++ b/deluge/ui/web/js/deluge-all/Menus.js @@ -240,38 +240,6 @@ deluge.menus.torrent = new Ext.menu.Menu({ }] }); -Deluge.StatusbarMenu = Ext.extend(Ext.menu.Menu, { - - setValue: function(value) { - var beenSet = false; - // set the new value - value = (value == 0) ? -1 : value; - - var other = null; - // uncheck all items - this.items.each(function(item) { - if (item.setChecked) { - item.suspendEvents(); - if (item.value == value) { - item.setChecked(true); - beenSet = true; - } else { - item.setChecked(false); - } - item.resumeEvents(); - } - - if (item.value == 'other') other = item; - }); - - if (beenSet) return; - - other.suspendEvents(); - other.setChecked(true); - other.resumeEvents(); - } -}); - deluge.menus.connections = new Deluge.StatusbarMenu({ id: 'connectionsMenu', items: [{ diff --git a/deluge/ui/web/js/deluge-all/StatusbarMenu.js b/deluge/ui/web/js/deluge-all/StatusbarMenu.js new file mode 100644 index 000000000..fa3a7a6f7 --- /dev/null +++ b/deluge/ui/web/js/deluge-all/StatusbarMenu.js @@ -0,0 +1,69 @@ +/*! + * Deluge.StatusbarMenu.js + * + * Copyright (c) Damien Churchill 2009-2010 + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3, or (at your option) + * any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, write to: + * The Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor + * Boston, MA 02110-1301, USA. + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the OpenSSL + * library. + * You must obey the GNU General Public License in all respects for all of + * the code used other than OpenSSL. If you modify file(s) with this + * exception, you may extend this exception to your version of the file(s), + * but you are not obligated to do so. If you do not wish to do so, delete + * this exception statement from your version. If you delete this exception + * statement from all source files in the program, then also delete it here. + */ +Ext.ns('Deluge'); + +/** + * Menu that handles setting the statusbar limits correctly. + * @class Deluge.StatusbarMenu + * @extends Ext.menu.Menu + */ +Deluge.StatusbarMenu = Ext.extend(Ext.menu.Menu, { + + setValue: function(value) { + var beenSet = false; + // set the new value + value = (value == 0) ? -1 : value; + + var other = null; + // uncheck all items + this.items.each(function(item) { + if (item.setChecked) { + item.suspendEvents(); + if (item.value == value) { + item.setChecked(true); + beenSet = true; + } else { + item.setChecked(false); + } + item.resumeEvents(); + } + + if (item.value == 'other') other = item; + }); + + if (beenSet) return; + + other.suspendEvents(); + other.setChecked(true); + other.resumeEvents(); + } +});