diff --git a/inst/www/shinyBS.js b/inst/www/shinyBS.js index fc63b23..a425cce 100644 --- a/inst/www/shinyBS.js +++ b/inst/www/shinyBS.js @@ -252,8 +252,8 @@ $.extend(dropdownBinding, { $(el).attr("data-value", value); }, receiveMessage: function(el, data) { - if(data.hasOwnProperty('selected')) { - $(el).attr("data-value", data.selected) + if(data.hasOwnProperty('value')) { + $(el).attr("data-value", data.value); } if(data.hasOwnProperty('label')) { $(el).children("a").html(data.label+""); @@ -262,11 +262,15 @@ $.extend(dropdownBinding, { $(el).children("ul.dropdown-menu").replaceWith(data.options); this.initialize(el); } + $(el).trigger('change'); }, subscribe: function(el, callback) { $(el).on("click.dropdownBinding", function(e) { callback(); }); + $(el).on("change.dropdownBinding", function(e) { + callback(); + }); }, initialize: function(el) { $(el).find("li").not(".divider, .nav-header, .dropdown-submenu").click(function() { @@ -783,4 +787,4 @@ Shiny.addCustomMessageHandler("highlightRows", $trs.removeAttr("style").attr("style", data.style); } -}) \ No newline at end of file +})