From f906dda156552375f6fae839de08926ece3b5936 Mon Sep 17 00:00:00 2001
From: Simon MacMullen <simon@rabbitmq.com>
Date: Wed, 12 Dec 2012 12:59:03 +0000
Subject: [PATCH] Different preferences per rate/chart.

---
 deps/rabbitmq_management/priv/www/js/charts.js             | 5 +++--
 deps/rabbitmq_management/priv/www/js/formatters.js         | 7 ++++---
 deps/rabbitmq_management/priv/www/js/main.js               | 2 +-
 deps/rabbitmq_management/priv/www/js/tmpl/rate-options.ejs | 6 ++++--
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/deps/rabbitmq_management/priv/www/js/charts.js b/deps/rabbitmq_management/priv/www/js/charts.js
index 5937417d3c..bc3fc9ecd4 100644
--- a/deps/rabbitmq_management/priv/www/js/charts.js
+++ b/deps/rabbitmq_management/priv/www/js/charts.js
@@ -48,7 +48,8 @@ function render_chart(div) {
 }
 
 function update_rate_options(sammy) {
-    store_pref('rate-mode', sammy.params['mode']);
-    store_pref('chart-size', sammy.params['size']);
+    var id = sammy.params['id'];
+    store_pref('rate-mode-' + id, sammy.params['mode']);
+    store_pref('chart-size-' + id, sammy.params['size']);
     partial_update();
 }
diff --git a/deps/rabbitmq_management/priv/www/js/formatters.js b/deps/rabbitmq_management/priv/www/js/formatters.js
index 8d8770c30e..1a286ec462 100644
--- a/deps/rabbitmq_management/priv/www/js/formatters.js
+++ b/deps/rabbitmq_management/priv/www/js/formatters.js
@@ -570,7 +570,7 @@ function rates_chart_or_text(id, stats, items, rates_counts) {
 
     if (keys(stats).length > 0) {
         var res;
-        var mode = get_pref('rate-mode');
+        var mode = get_pref('rate-mode-' + id);
         if (mode == 'chart') {
             res = rates_chart(id, items, stats, rates_counts);
         }
@@ -585,11 +585,12 @@ function rates_chart_or_text(id, stats, items, rates_counts) {
         res = '<p>Currently idle</p>';
     }
 
-    return res + '<p class="rate-options-p"><span class="rate-options">(...)</span></p>';
+    return res + '<p class="rate-options-p"><span class="rate-options" for="' +
+        id + '">(...)</span></p>';
 }
 
 function rates_chart(id, items, stats, rates_counts) {
-    var size = get_pref('chart-size');
+    var size = get_pref('chart-size-' + id);
     var show = false;
     chart_data[id] = {};
     for (var i in items) {
diff --git a/deps/rabbitmq_management/priv/www/js/main.js b/deps/rabbitmq_management/priv/www/js/main.js
index d4cc9ed754..94c7553da9 100644
--- a/deps/rabbitmq_management/priv/www/js/main.js
+++ b/deps/rabbitmq_management/priv/www/js/main.js
@@ -435,7 +435,7 @@ function postprocess() {
         help($(this).attr('id'))
     });
     $('.rate-options').die().live('click', function() {
-        show_popup('help', format('rate-options', {}));
+        show_popup('help', format('rate-options', {span: $(this)}));
     });
     $('input, select').live('focus', function() {
         update_counter = 0; // If there's interaction, reset the counter.
diff --git a/deps/rabbitmq_management/priv/www/js/tmpl/rate-options.ejs b/deps/rabbitmq_management/priv/www/js/tmpl/rate-options.ejs
index 1eac4782ff..2d76ad9d09 100644
--- a/deps/rabbitmq_management/priv/www/js/tmpl/rate-options.ejs
+++ b/deps/rabbitmq_management/priv/www/js/tmpl/rate-options.ejs
@@ -1,9 +1,11 @@
 <%
-   var mode = get_pref('rate-mode');
-   var size = get_pref('chart-size');
+   var id = span.attr('for');
+   var mode = get_pref('rate-mode-' + id);
+   var size = get_pref('chart-size-' + id);
 %>
 
 <form action="#/rate-options" method="put" class="auto-submit">
+  <input type="hidden" name="id" value="<%= id %>"/>
   <table class="form">
     <tr>
       <th><label>Display:</label></th>