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

use naturalHeight and naturalWidth for default dim values. Followup comments from winston (#2201)

Browse Source
This commit is contained in:
Barret Schloerke
2018-09-27 16:16:11 -04:00
committed by GitHub
parent 112466de1e
commit d38b939c63
5 changed files with 23 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
srcjs/output_binding_image.js
View File

@@ -76,7 +76,9 @@ $.extend(imageOutputBinding, {
if (value === null || key === 'coordmap') {
return;
}
if (key === "src" && value === img.src) {
// this checks only against base64 encoded src values
// images put here are only from renderImage and renderPlot
if (key === "src" && value === img.getAttribute("src")) {
// Ensure the browser actually fires an onLoad event, which doesn't
// happen on WebKit if the value we set on src is the same as the
// value it already has
@@ -102,6 +104,7 @@ $.extend(imageOutputBinding, {
opts.coordmap = {
panels: [],
dims: {
// These values be set to the naturalWidth and naturalHeight once the image has loaded
height: null,
width: null
}
@@ -372,9 +375,11 @@ imageutils.initCoordmap = function($el, coordmap) {
};
}
// if no dim height and width values are found, set them to the image height and width
coordmap.dims.height = coordmap.dims.height || img.clientHeight;
coordmap.dims.width = coordmap.dims.width || img.clientWidth;
// If no dim height and width values are found, set them to the raw image height and width
// These values should be the same...
// This is only done to initialize an image output, whose height and width are unknown until the image is retrieved
coordmap.dims.height = coordmap.dims.height || img.naturalHeight;
coordmap.dims.width = coordmap.dims.width || img.naturalWidth;
// Add scaling functions to each panel
imageutils.initPanelScales(coordmap.panels);