mirror of https://github.com/layui/layui
chore: Merge branch 'fix/layer-scrollbar'
commit
d8d7687574
|
@ -533,15 +533,18 @@ Class.pt.creat = function(){
|
||||||
win.on('resize', ready.events.resize[that.index]);
|
win.on('resize', ready.events.resize[that.index]);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 记录配置信息
|
||||||
|
that.layero.data('config', config);
|
||||||
|
|
||||||
|
// 自动关闭
|
||||||
config.time <= 0 || setTimeout(function(){
|
config.time <= 0 || setTimeout(function(){
|
||||||
layer.close(that.index);
|
layer.close(that.index);
|
||||||
}, config.time);
|
}, config.time);
|
||||||
|
|
||||||
|
|
||||||
that.move().callback();
|
that.move().callback();
|
||||||
setAnim(that.layero);
|
setAnim(that.layero);
|
||||||
|
|
||||||
// 记录配置信息
|
|
||||||
that.layero.data('config', config);
|
|
||||||
};
|
};
|
||||||
|
|
||||||
// 当前实例的 resize 事件
|
// 当前实例的 resize 事件
|
||||||
|
@ -1029,7 +1032,8 @@ ready.restScrollbar = function(index) {
|
||||||
// 关闭和大小化, layer-full 处理
|
// 关闭和大小化, layer-full 处理
|
||||||
var targetEl = $('.'+ doms[0]).filter(function(){
|
var targetEl = $('.'+ doms[0]).filter(function(){
|
||||||
var layero = $(this);
|
var layero = $(this);
|
||||||
return layero.data('config').scrollbar === false
|
var options = layero.data('config') || {};
|
||||||
|
return options.scrollbar === false
|
||||||
&& layero.data('maxminStatus') !== 'min'
|
&& layero.data('maxminStatus') !== 'min'
|
||||||
&& layero.attr('times') !== String(index);
|
&& layero.attr('times') !== String(index);
|
||||||
});
|
});
|
||||||
|
|
Loading…
Reference in New Issue