github
/
layer
mirror of https://github.com/layui/layer
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #36 from 390029659/master 

修改图片超出屏幕后，重新计算大小的算法
pull/54/head
贤心 2016-11-07 20:20:40 +08:00 committed by GitHub
parent 5cc5bb40fc 18614f55e7
commit 2ebf61fe6c
1 changed files with 12 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/layer.js
View File

@ -1140,11 +1140,18 @@ layer.photos = function(options, loop, key){
type: 1, type: 1,
area: function(){ area: function(){
var imgarea = [img.width, img.height]; var imgarea = [img.width, img.height];
var winarea = [$(window).width() - 50, $(window).height() - 50]; var winarea = [$(window).width() - 100, $(window).height() - 100];
if(!options.full && imgarea[0] > winarea[0]){ if(!options.full && (imgarea[0]>winarea[0]||imgarea[1]>winarea[1])){//如果 实际图片的宽或者高比 屏幕大（那么进行缩放）
imgarea[0] = winarea[0]; var wh = [imgarea[0]/winarea[0],imgarea[1]/winarea[1]];//取 宽度 缩放比例 高度缩放比例
imgarea[1] = imgarea[0]*img.height/img.width; if(wh[0] > wh[1]){//取缩放比例最大的进行缩放
} imgarea[0] = imgarea[0]/wh[0];
imgarea[1] = imgarea[1]/wh[0];
}
else if(wh[0] < wh[1]){
imgarea[0] = imgarea[0]/wh[1];
imgarea[1] = imgarea[1]/wh[1];
}
}
return [imgarea[0]+'px', imgarea[1]+'px']; return [imgarea[0]+'px', imgarea[1]+'px'];
}(), }(),
title: false, title: false,