From 5124b777413cf79dff11eb3dc31517c625b66f76 Mon Sep 17 00:00:00 2001 From: Gunther Brunner Date: Mon, 14 Apr 2014 17:50:32 +0900 Subject: [PATCH] Cache image width and height. --- res/app/components/stf/screen/screen-directive.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/res/app/components/stf/screen/screen-directive.js b/res/app/components/stf/screen/screen-directive.js index d5fa5bea..c95d876f 100644 --- a/res/app/components/stf/screen/screen-directive.js +++ b/res/app/components/stf/screen/screen-directive.js @@ -13,6 +13,8 @@ module.exports = function DeviceScreenDirective($document, ScalingService) { , displayHeight = 0 , cachedDisplayWidth = 0 , cachedDisplayHeight = 0 + , cachedImageWidth = 0 + , cachedImageHeight = 0 , loading = false , scaler , seq = 0 @@ -116,13 +118,18 @@ module.exports = function DeviceScreenDirective($document, ScalingService) { // Check to set the size only if updated if (cachedDisplayWidth !== displayWidth || - cachedDisplayHeight !== displayHeight) { + cachedDisplayHeight !== displayHeight || + cachedImageWidth !== image.width || + cachedImageHeight !== image.height) { cachedDisplayWidth = displayWidth cachedDisplayHeight = displayHeight - imageRender.canvasWidth = image.width - imageRender.canvasHeight = image.height + cachedImageWidth = image.width + cachedImageHeight = image.height + + imageRender.canvasWidth = cachedImageWidth + imageRender.canvasHeight = cachedImageHeight var size = scaler.projectedSize(displayWidth, displayHeight) imageRender.canvasStyleWidth = size.width