r4sas/webogram-i2p
1
0
Fork 0
Code Issues Releases Wiki Activity

Fixed invalid image src

Browse Source
This commit is contained in:
Igor Zhukov 2014-11-13 14:18:40 +03:00
parent 8de7bb54c5
commit 506ea5055e
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/js/directives.js
View File

@ -1427,11 +1427,11 @@ angular.module('myApp.directives', ['myApp.filters'])
var jump = 0; var jump = 0;
$scope.$watchCollection('fullPhoto.location', function () { $scope.$watchCollection('fullPhoto.location', function () {
var cachedSrc = MtpApiFileManager.getCachedFile($scope.thumbLocation), var cachedBlob = MtpApiFileManager.getCachedFile($scope.thumbLocation),
curJump = ++jump; curJump = ++jump;
if (cachedSrc) { if (cachedBlob) {
imgElement.src = cachedSrc; imgElement.src = FileManager.getUrl(cachedBlob, 'image/jpeg');
resize(); resize();
} else { } else {
imgElement.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7'; imgElement.src = 'data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7';
@ -1636,7 +1636,10 @@ angular.module('myApp.directives', ['myApp.filters'])
$scope.imageWidth = wh.w; $scope.imageWidth = wh.w;
$scope.imageHeight = wh.h; $scope.imageHeight = wh.h;
$scope.thumbSrc = MtpApiFileManager.getCachedFile(thumbPhotoSize.location); var cachedBlob = MtpApiFileManager.getCachedFile(thumbPhotoSize.location);
if (cachedBlob) {
$scope.thumbSrc = FileManager.getUrl(cachedBlob, 'image/jpeg');
}
} }
$scope.frameWidth = Math.max($scope.imageWidth, Math.min(600, fullWidth)) $scope.frameWidth = Math.max($scope.imageWidth, Math.min(600, fullWidth))