Merge remote-tracking branch 'origin/image-attr'

Conflicts:
	inst/www/shared/shiny.js
	inst/www/shared/shiny.js.map
	inst/www/shared/shiny.min.js
	inst/www/shared/shiny.min.js.map
This commit is contained in:
Joe Cheng
2016-01-08 10:55:21 -08:00
5 changed files with 7 additions and 7 deletions

View File

@@ -65,7 +65,7 @@ $.extend(imageOutputBinding, {
// Copy items from data to img. This should include 'src'
$.each(data, function(key, value) {
if (value !== null)
img[key] = value;
img.setAttribute(key, value);
});
var $img = $(img);