Skip to content

Commit

Permalink
Conditional panel expressions were broken for typed inputs
Browse files Browse the repository at this point in the history
  • Loading branch information
jcheng5 committed Sep 26, 2013
1 parent de01c96 commit b60d6cc
Showing 1 changed file with 12 additions and 1 deletion.
13 changes: 12 additions & 1 deletion inst/www/shared/shiny.js
Original file line number Diff line number Diff line change
Expand Up @@ -643,7 +643,18 @@
};

this.$updateConditionals = function() {
var scope = {input: this.$inputValues, output: this.$values};
var inputs = {};

// Input keys use "name:type" format; we don't want the user to
// have to know about the type suffix when referring to inputs.
for (var name in this.$inputValues) {
if (this.$inputValues.hasOwnProperty(name)) {
var shortName = name.replace(/:.*/, '');
inputs[shortName] = this.$inputValues[name];
}
}

var scope = {input: inputs, output: this.$values};

var triggerShown = function() { $(this).trigger('shown'); };
var triggerHidden = function() { $(this).trigger('hidden'); };
Expand Down

0 comments on commit b60d6cc

Please sign in to comment.