From 51555cab83ed928e92e5ad9efb53159381f092c4 Mon Sep 17 00:00:00 2001
From: Damien Churchill <damoxc@gmail.com>
Date: Thu, 18 Mar 2010 23:01:42 +0000
Subject: [PATCH] fix the quick limits menus fix displaying speeds with limits

---
 deluge/ui/web/js/deluge-all/Deluge.Menus.js     | 6 +++---
 deluge/ui/web/js/deluge-all/Deluge.Statusbar.js | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/deluge/ui/web/js/deluge-all/Deluge.Menus.js b/deluge/ui/web/js/deluge-all/Deluge.Menus.js
index 65e0823f9..2acb7ad90 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Menus.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Menus.js
@@ -34,7 +34,7 @@ Copyright:
 
 deluge.menus = {
 	onTorrentAction: function(item, e) {
-		var selection = Deluge.Torrents.getSelections();
+		var selection = deluge.torrents.getSelections();
 		var ids = [];
 		Ext.each(selection, function(record) {
 			ids.push(record.id);
@@ -451,9 +451,9 @@ function onLimitChanged(item, checked) {
 	} else {
 		config = {}
 		config[item.group] = item.value
-		Deluge.Client.core.set_config(config, {
+		deluge.client.core.set_config(config, {
 			success: function() {
-				Deluge.UI.update();
+				deluge.ui.update();
 			}
 		});
 	}
diff --git a/deluge/ui/web/js/deluge-all/Deluge.Statusbar.js b/deluge/ui/web/js/deluge-all/Deluge.Statusbar.js
index 09e696f3b..0f4f57dd0 100644
--- a/deluge/ui/web/js/deluge-all/Deluge.Statusbar.js
+++ b/deluge/ui/web/js/deluge-all/Deluge.Statusbar.js
@@ -92,8 +92,8 @@ Deluge.Statusbar = Ext.extend(Ext.ux.StatusBar, {
 		var updateStat = function(name, config) {
 			var item = this.items.get('statusbar-' + name);
 			if (config.limit.value > 0) {
-				var value = (config.value.formatter) ? config.value.formatter(config.value.value) : config.value.value;
-				var limit = (config.limit.formatter) ? config.limit.formatter(config.limit.value) : config.limit.value;
+				var value = (config.value.formatter) ? config.value.formatter(config.value.value, true) : config.value.value;
+				var limit = (config.limit.formatter) ? config.limit.formatter(config.limit.value, true) : config.limit.value;
 				var str = String.format(config.format, value, limit);
 			} else {
 				var str = (config.value.formatter) ? config.value.formatter(config.value.value, true) : config.value.value;