From e1fa491af7f113016aa2bb2f0fe2fcec32c078f1 Mon Sep 17 00:00:00 2001
From: Winston Chang <winston@stdout.org>
Date: Thu, 16 Apr 2015 20:52:35 -0500
Subject: [PATCH] Fix panel matching logic

---
 srcjs/output_binding_image.js | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/srcjs/output_binding_image.js b/srcjs/output_binding_image.js
index 5580212a7..e94a96c11 100644
--- a/srcjs/output_binding_image.js
+++ b/srcjs/output_binding_image.js
@@ -851,6 +851,8 @@ imageutils.createBrush = function($el, opts, coordmap, expandPixels) {
       return;
 
     // Find a panel that has matching vars; if none found, we can't restore.
+    // vars and oldVars will be something like:
+    //   [ {name: "cyl", value: "4"}, {name: "am", value: "0"} ]
     var oldVars = asArray(oldPanel.vars).sort();
     for (var i=0; i<coordmap.length; i++){
       var vars = asArray(coordmap[i].vars).sort();
@@ -864,14 +866,20 @@ imageutils.createBrush = function($el, opts, coordmap, expandPixels) {
         break;
       }
 
+      // Check the variables in this panel; start off assuming we have a match
+      // and mark it if we find a mismatch.
+      var allMatch = true;
       for (var j=0; j<vars.length; j++) {
-        // Check that name and value match
-        if (vars[j].name === oldVars[j].name && vars[j].value === oldVars[j].value) {
-
-          state.panel = coordmap[i];
+        if (vars[j].name !== oldVars[j].name || vars[j].value !== oldVars[j].value) {
+          allMatch = false;
           break;
         }
       }
+
+      if (allMatch) {
+        state.panel = coordmap[i];
+        break;
+      }
     }
 
     // If we didn't find a matching panel, remove the old div and return