Skip to content

Commit

Permalink
Merge pull request #1449 from rstudio/barbara/bugfix/insert-ui
Browse files Browse the repository at this point in the history
Fix #1438: `unbindAll()` should not be called when inserting content with `insertUI()`
  • Loading branch information
wch committed Dec 1, 2016
2 parents dad401a + ef35fc6 commit fc7f454
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 4 deletions.
2 changes: 2 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ shiny 0.14.2.9000

### Bug fixes

* Fix [#1438](https://github.com/rstudio/shiny/issue/1438): `unbindAll()` should not be called when inserting content with `insertUI()` ([#1449](https://github.com/rstudio/shiny/pull/1449))

* Fixed bug causing `<meta>` tags associated with HTML dependencies of Shiny R Markdown files to be rendered incorrectly. ([#1463](https://github.com/rstudio/shiny/pull/1463))


Expand Down
4 changes: 4 additions & 0 deletions inst/www/shared/shiny.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion inst/www/shared/shiny.js.map

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions inst/www/shared/shiny.min.js

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion inst/www/shared/shiny.min.js.map

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions srcjs/output_binding_html.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ var renderDependencies = exports.renderDependencies = function(dependencies) {
// inputs/outputs. `content` can be null, a string, or an object with
// properties 'html' and 'deps'.
exports.renderContent = function(el, content, where="replace") {
if (where === "replace") {
exports.unbindAll(el);
}

exports.unbindAll(el);

var html;
Expand Down

0 comments on commit fc7f454

Please sign in to comment.