github/shiny
1
1
Fork 0
mirror of https://github.com/rstudio/shiny.git synced 2026-02-05 04:05:06 -05:00
Code Issues Packages Projects Releases Wiki Activity

Fix panel matching logic

Browse Source
This commit is contained in:
Winston Chang
2015-04-16 20:52:35 -05:00
parent b909a3e05c
commit e1fa491af7
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
srcjs/output_binding_image.js
View File

@@ -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