Scale rect to fit, including upscaling

From yesterday's post, I forgot the code snippet couldn't upscale, only downscale. This remedies that.
Same downscaling part, but afterwards, if it wasn't downscaled, upscale to the nearest dimension. Basically checking the scale factor for current width -> desired width vs. current height -> desired height. Then we're choosing the smaller ratio, as that would prevent any part of the rect from going outside the bounds.

JsFiddle: