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

Merge pull request #9 from Feelop/patch-4 

提交两个补充内容
pull/10/head
贤心 2015-06-10 09:39:55 +08:00
parent 935eed0344 eaba17bf9e
commit e90a35e955
1 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/layer.js
View File

@ -185,7 +185,8 @@ Class.pt.config = {
Class.pt.vessel = function(conType, callback){
var that = this, times = that.index, config = that.config;
var zIndex = config.zIndex + times, titype = typeof config.title === 'object';
var ismax = config.maxmin && (config.type === 1 || config.type === 2);
var ismax = (config.maxmin || config.max) && (config.type === 1 || config.type === 2);
var ismin = (config.maxmin || config.min) && (config.type === 1 || config.type === 2);
var titleHTML = (config.title ? '<div class="layui-layer-title" style="'+ (titype ? config.title[1] : '') +'">'
+ (titype ? config.title[0] : config.title)
+ '</div>' : '');
@ -203,7 +204,9 @@ Class.pt.vessel = function(conType, callback){
+ (config.type == 1 && conType ? '' : (config.content||''))
+'</div>'
+ '<span class="layui-layer-setwin">'+ function(){
var closebtn = ismax ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a><a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>' : '';
var closebtn = '';
closebtn += ismin ? '<a class="layui-layer-min" href="javascript:;"><cite></cite></a>' : '';
closebtn += ismax ? '<a class="layui-layer-ico layui-layer-max" href="javascript:;"></a>' : '';
config.closeBtn && (closebtn += '<a class="layui-layer-ico '+ doms[7] +' '+ doms[7] + (config.title ? config.closeBtn : (config.type == 4 ? '1' : '2')) +'" href="javascript:;"></a>');
return closebtn;
}() + '</span>'
@ -327,8 +330,8 @@ Class.pt.auto = function(index){
};
//计算坐标
Class.pt.offset = function(){
var that = this, config = that.config, layero = that.layero;
Class.pt.offset = function (times) {
var that = this, times = times || that.index, config = that.config, layero = $('#' + doms[0] + times);
var area = [layero.outerWidth(), layero.outerHeight()];
var type = typeof config.offset === 'object';
that.offsetTop = (win.height() - area[1])/2;
@ -601,6 +604,9 @@ Class.pt.openLayer = function(){
layero.on('mousedown', setZindex);
return layer.zIndex;
};
layer.autoOffset = function (index) {
return that.offset(index);
};
};
ready.record = function(layero){
@ -781,4 +787,4 @@ ready.run = function(){
layer.use('skin/layer.css');
}();
}(window);
}(window);