mirror of https://github.com/layui/layer
3.1.0-rc.1
parent
3c7eb76d9a
commit
deb52414e8
|
@ -1,4 +1,13 @@
|
|||
|
||||
# v3.1.0 未正式发布
|
||||
|
||||
* 去除type:2时如果content未填写而弹出layer官网的默认设置
|
||||
* 修复layer.js 未设置btnAlign时,包裹按钮的div.layui-layer-btn 出现一多余class(Merge pull request from meihangbo/patch-2)
|
||||
|
||||
|
||||
---
|
||||
|
||||
|
||||
# v3.0.3 2017.03.06
|
||||
|
||||
* 增加参数 isOutAnim,用于控制是否显示关闭动画,true 或者 false
|
||||
|
|
|
@ -232,7 +232,7 @@ Class.pt.vessel = function(conType, callback){
|
|||
for(var i = 0, len = config.btn.length; i < len; i++){
|
||||
button += '<a class="'+ doms[6] +''+ i +'">'+ config.btn[i] +'</a>'
|
||||
}
|
||||
return '<div class="'+ doms[6] + ((config.btnAlign&&config.btnAlign.length>0)? (' layui-layer-btn-' + config.btnAlign) : ' ') +'">'+ button +'</div>'
|
||||
return '<div class="'+ doms[6] + (config.btnAlign ? (' layui-layer-btn-' + config.btnAlign) : '') +'">'+ button +'</div>'
|
||||
}() : '')
|
||||
+ (config.resize ? '<span class="layui-layer-resize"></span>' : '')
|
||||
+ '</div>'
|
||||
|
@ -270,7 +270,7 @@ Class.pt.creat = function(){
|
|||
layer.closeAll('dialog');
|
||||
break;
|
||||
case 2:
|
||||
var content = config.content = conType ? config.content : [config.content||'http://layer.layui.com', 'auto'];
|
||||
var content = config.content = conType ? config.content : [config.content, 'auto'];
|
||||
config.content = '<iframe scrolling="'+ (config.content[1]||'auto') +'" allowtransparency="true" id="'+ doms[4] +''+ times +'" name="'+ doms[4] +''+ times +'" onload="this.className=\'\';" class="layui-layer-load" frameborder="0" src="' + config.content[0] + '"></iframe>';
|
||||
break;
|
||||
case 3:
|
||||
|
|
Loading…
Reference in New Issue