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

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

Browse Source 
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
parent 483a7d34c5 2f25d25eec
commit f2410abc48
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
inst/www/shared/shiny.js
View File

@@ -1465,7 +1465,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);

2
inst/www/shared/shiny.js.map
View File

File diff suppressed because one or more lines are too long

6
inst/www/shared/shiny.min.js vendored
View File

File diff suppressed because one or more lines are too long

2
inst/www/shared/shiny.min.js.map
View File

File diff suppressed because one or more lines are too long

2
srcjs/output_binding_image.js
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);