- '+function(){var e=t.length,i=1,a="";if(e>0)for(a='
- '+(t[0].content||"no content")+" ";i
是否继续查看下一张？",{time:3e4,btn:["下一张","不看了"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){r.ready(),o.run(e.jQuery)}()}(window); \ No newline at end of file +/** layer-v3.5.0 Web 通用弹出层组件 MIT License */ + ;!function(e,t){"use strict";var i,n,a=e.layui&&layui.define,o={getPath:function(){var t=document.currentScript?document.currentScript.src:function(){for(var e,t=document.scripts,i=t.length-1,n=i;n>0;n--)if("interactive"===t[n].readyState){e=t[n].src;break}return e||t[i].src}(),i=e.LAYUI_GLOBAL||{};return i.layer_dir||t.substring(0,t.lastIndexOf("/")+1)}(),config:{},end:{},minIndex:0,minLeft:[],btn:["确定","取消"],type:["dialog","page","iframe","loading","tips"],getStyle:function(t,i){var n=t.currentStyle?t.currentStyle:e.getComputedStyle(t,null);return n[n.getPropertyValue?"getPropertyValue":"getAttribute"](i)},link:function(t,i,n){if(r.path){var a=document.getElementsByTagName("head")[0],s=document.createElement("link");"string"==typeof i&&(n=i);var l=(n||t).replace(/\.|\//g,""),f="layuicss-"+l,c="creating",u=0;s.rel="stylesheet",s.href=r.path+t,s.id=f,document.getElementById(f)||a.appendChild(s),"function"==typeof i&&!function d(t){var n=100,a=document.getElementById(f);return++u>1e4/n?e.console&&console.error(l+".css: Invalid"):void(1989===parseInt(o.getStyle(a,"width"))?(t===c&&a.removeAttribute("lay-status"),a.getAttribute("lay-status")===c?setTimeout(d,n):i()):(a.setAttribute("lay-status",c),setTimeout(function(){d(c)},n)))}()}}},r={v:"3.5.0",ie:function(){var t=navigator.userAgent.toLowerCase();return!!(e.ActiveXObject||"ActiveXObject"in e)&&((t.match(/msie\s(\d+)/)||[])[1]||"11")}(),index:e.layer&&e.layer.v?1e5:0,path:o.getPath,config:function(e,t){return e=e||{},r.cache=o.config=i.extend({},o.config,e),r.path=o.config.path||r.path,"string"==typeof e.extend&&(e.extend=[e.extend]),o.config.path&&r.ready(),e.extend?(a?layui.addcss("modules/layer/"+e.extend):o.link("theme/"+e.extend),this):this},ready:function(e){var t="layer",i="",n=(a?"modules/layer/":"theme/")+"default/layer.css?v="+r.v+i;return a?layui.addcss(n,e,t):o.link(n,e,t),this},alert:function(e,t,n){var a="function"==typeof t;return a&&(n=t),r.open(i.extend({content:e,yes:n},a?{}:t))},confirm:function(e,t,n,a){var s="function"==typeof t;return s&&(a=n,n=t),r.open(i.extend({content:e,btn:o.btn,yes:n,btn2:a},s?{}:t))},msg:function(e,n,a){var s="function"==typeof n,f=o.config.skin,c=(f?f+" "+f+"-msg":"")||"layui-layer-msg",u=l.anim.length-1;return s&&(a=n),r.open(i.extend({content:e,time:3e3,shade:!1,skin:c,title:!1,closeBtn:!1,btn:!1,resize:!1,end:a},s&&!o.config.skin?{skin:c+" layui-layer-hui",anim:u}:function(){return n=n||{},(n.icon===-1||n.icon===t&&!o.config.skin)&&(n.skin=c+" "+(n.skin||"layui-layer-hui")),n}()))},load:function(e,t){return r.open(i.extend({type:3,icon:e||0,resize:!1,shade:.01},t))},tips:function(e,t,n){return r.open(i.extend({type:4,content:[e,t],closeBtn:!1,time:3e3,shade:!1,resize:!1,fixed:!1,maxWidth:260},n))}},s=function(e){var t=this,a=function(){t.creat()};t.index=++r.index,t.config.maxWidth=i(n).width()-30,t.config=i.extend({},t.config,o.config,e),document.body?a():setTimeout(function(){a()},30)};s.pt=s.prototype;var l=["layui-layer",".layui-layer-title",".layui-layer-main",".layui-layer-dialog","layui-layer-iframe","layui-layer-content","layui-layer-btn","layui-layer-close"];l.anim=["layer-anim-00","layer-anim-01","layer-anim-02","layer-anim-03","layer-anim-04","layer-anim-05","layer-anim-06"],l.SHADE="layui-layer-shade",l.MOVE="layui-layer-move",s.pt.config={type:0,shade:.3,fixed:!0,move:l[1],title:"信息",offset:"auto",area:"auto",closeBtn:1,time:0,zIndex:19891014,maxWidth:360,anim:0,isOutAnim:!0,minStack:!0,icon:-1,moveType:1,resize:!0,scrollbar:!0,tips:2},s.pt.vessel=function(e,t){var n=this,a=n.index,r=n.config,s=r.zIndex+a,f="object"==typeof r.title,c=r.maxmin&&(1===r.type||2===r.type),u=r.title?'
'+(f?r.title[0]:r.title)+"
":"";return r.zIndex=s,t([r.shade?'':"",''+(e&&2!=r.type?"":u)+''+r.btn[t]+"";return'
"],u,i('')),n},s.pt.creat=function(){var e=this,t=e.config,a=e.index,s=t.content,f="object"==typeof s,c=i("body");if(!t.id||!i("#"+t.id)[0]){switch("string"==typeof t.area&&(t.area="auto"===t.area?["",""]:[t.area,""]),t.shift&&(t.anim=t.shift),6==r.ie&&(t.fixed=!1),t.type){case 0:t.btn="btn"in t?t.btn:o.btn[0],r.closeAll("dialog");break;case 2:var s=t.content=f?t.content:[t.content||"","auto"];t.content='';break;case 3:delete t.title,delete t.closeBtn,t.icon===-1&&0===t.icon,r.closeAll("loading");break;case 4:f||(t.content=[t.content,"body"]),t.follow=t.content[1],t.content=t.content[0]+'',delete t.title,t.tips="object"==typeof t.tips?t.tips:[t.tips,!0],t.tipsMore||r.closeAll("tips")}if(e.vessel(f,function(n,r,u){c.append(n[0]),f?function(){2==t.type||4==t.type?function(){i("body").append(n[1])}():function(){s.parents("."+l[0])[0]||(s.data("display",s.css("display")).show().addClass("layui-layer-wrap").wrap(n[1]),i("#"+l[0]+a).find("."+l[5]).before(r))}()}():c.append(n[1]),i("#"+l.MOVE)[0]||c.append(o.moveElem=u),e.layero=i("#"+l[0]+a),e.shadeo=i("#"+l.SHADE+a),t.scrollbar||l.html.css("overflow","hidden").attr("layer-full",a)}).auto(a),e.shadeo.css({"background-color":t.shade[1]||"#000",opacity:t.shade[0]||t.shade}),2==t.type&&6==r.ie&&e.layero.find("iframe").attr("src",s[0]),4==t.type?e.tips():function(){e.offset(),parseInt(o.getStyle(document.getElementById(l.MOVE),"z-index"))||function(){e.layero.css("visibility","hidden"),r.ready(function(){e.offset(),e.layero.css("visibility","visible")})}()}(),t.fixed&&n.on("resize",function(){e.offset(),(/^\d+%$/.test(t.area[0])||/^\d+%$/.test(t.area[1]))&&e.auto(a),4==t.type&&e.tips()}),t.time<=0||setTimeout(function(){r.close(e.index)},t.time),e.move().callback(),l.anim[t.anim]){var u="layer-anim "+l.anim[t.anim];e.layero.addClass(u).one("webkitAnimationEnd mozAnimationEnd MSAnimationEnd oanimationend animationend",function(){i(this).removeClass(u)})}t.isOutAnim&&e.layero.data("isOutAnim",!0)}},s.pt.auto=function(e){var t=this,a=t.config,o=i("#"+l[0]+e);""===a.area[0]&&a.maxWidth>0&&(r.ie&&r.ie<8&&a.btn&&o.width(o.innerWidth()),o.outerWidth()>a.maxWidth&&o.width(a.maxWidth));var s=[o.innerWidth(),o.innerHeight()],f=o.find(l[1]).outerHeight()||0,c=o.find("."+l[6]).outerHeight()||0,u=function(e){e=o.find(e),e.height(s[1]-f-c-2*(0|parseFloat(e.css("padding-top"))))};switch(a.type){case 2:u("iframe");break;default:""===a.area[1]?a.maxHeight>0&&o.outerHeight()>a.maxHeight?(s[1]=a.maxHeight,u("."+l[5])):a.fixed&&s[1]>=n.height()&&(s[1]=n.height(),u("."+l[5])):u("."+l[5])}return t},s.pt.offset=function(){var e=this,t=e.config,i=e.layero,a=[i.outerWidth(),i.outerHeight()],o="object"==typeof t.offset;e.offsetTop=(n.height()-a[1])/2,e.offsetLeft=(n.width()-a[0])/2,o?(e.offsetTop=t.offset[0],e.offsetLeft=t.offset[1]||e.offsetLeft):"auto"!==t.offset&&("t"===t.offset?e.offsetTop=0:"r"===t.offset?e.offsetLeft=n.width()-a[0]:"b"===t.offset?e.offsetTop=n.height()-a[1]:"l"===t.offset?e.offsetLeft=0:"lt"===t.offset?(e.offsetTop=0,e.offsetLeft=0):"lb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=0):"rt"===t.offset?(e.offsetTop=0,e.offsetLeft=n.width()-a[0]):"rb"===t.offset?(e.offsetTop=n.height()-a[1],e.offsetLeft=n.width()-a[0]):e.offsetTop=t.offset),t.fixed||(e.offsetTop=/%$/.test(e.offsetTop)?n.height()*parseFloat(e.offsetTop)/100:parseFloat(e.offsetTop),e.offsetLeft=/%$/.test(e.offsetLeft)?n.width()*parseFloat(e.offsetLeft)/100:parseFloat(e.offsetLeft),e.offsetTop+=n.scrollTop(),e.offsetLeft+=n.scrollLeft()),i.attr("minLeft")&&(e.offsetTop=n.height()-(i.find(l[1]).outerHeight()||0),e.offsetLeft=i.css("left")),i.css({top:e.offsetTop,left:e.offsetLeft})},s.pt.tips=function(){var e=this,t=e.config,a=e.layero,o=[a.outerWidth(),a.outerHeight()],r=i(t.follow);r[0]||(r=i("body"));var s={width:r.outerWidth(),height:r.outerHeight(),top:r.offset().top,left:r.offset().left},f=a.find(".layui-layer-TipsG"),c=t.tips[0];t.tips[1]||f.remove(),s.autoLeft=function(){s.left+o[0]-n.width()>0?(s.tipLeft=s.left+s.width-o[0],f.css({right:12,left:"auto"})):s.tipLeft=s.left},s.where=[function(){s.autoLeft(),s.tipTop=s.top-o[1]-10,f.removeClass("layui-layer-TipsB").addClass("layui-layer-TipsT").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left+s.width+10,s.tipTop=s.top,f.removeClass("layui-layer-TipsL").addClass("layui-layer-TipsR").css("border-bottom-color",t.tips[1])},function(){s.autoLeft(),s.tipTop=s.top+s.height+10,f.removeClass("layui-layer-TipsT").addClass("layui-layer-TipsB").css("border-right-color",t.tips[1])},function(){s.tipLeft=s.left-o[0]-10,s.tipTop=s.top,f.removeClass("layui-layer-TipsR").addClass("layui-layer-TipsL").css("border-bottom-color",t.tips[1])}],s.where[c-1](),1===c?s.top-(n.scrollTop()+o[1]+16)<0&&s.where[2]():2===c?n.width()-(s.left+s.width+o[0]+16)>0||s.where[3]():3===c?s.top-n.scrollTop()+s.height+o[1]+16-n.height()>0&&s.where[0]():4===c&&o[0]+16-s.left>0&&s.where[1](),a.find("."+l[5]).css({"background-color":t.tips[1],"padding-right":t.closeBtn?"30px":""}),a.css({left:s.tipLeft-(t.fixed?n.scrollLeft():0),top:s.tipTop-(t.fixed?n.scrollTop():0)})},s.pt.move=function(){var e=this,t=e.config,a=i(document),s=e.layero,l=s.find(t.move),f=s.find(".layui-layer-resize"),c={};return t.move&&l.css("cursor","move"),l.on("mousedown",function(e){e.preventDefault(),t.move&&(c.moveStart=!0,c.offset=[e.clientX-parseFloat(s.css("left")),e.clientY-parseFloat(s.css("top"))],o.moveElem.css("cursor","move").show())}),f.on("mousedown",function(e){e.preventDefault(),c.resizeStart=!0,c.offset=[e.clientX,e.clientY],c.area=[s.outerWidth(),s.outerHeight()],o.moveElem.css("cursor","se-resize").show()}),a.on("mousemove",function(i){if(c.moveStart){var a=i.clientX-c.offset[0],o=i.clientY-c.offset[1],l="fixed"===s.css("position");if(i.preventDefault(),c.stX=l?0:n.scrollLeft(),c.stY=l?0:n.scrollTop(),!t.moveOut){var f=n.width()-s.outerWidth()+c.stX,u=n.height()-s.outerHeight()+c.stY;a'+(0==r.type&&r.icon!==-1?'':"")+(1==r.type&&e?"":r.content||"")+'
'+function(){var e=c?'':"";return r.closeBtn&&(e+=''),e}()+""+(r.btn?function(){var e="";"string"==typeof r.btn&&(r.btn=[r.btn]);for(var t=0,i=r.btn.length;t'+e+"
"}():"")+(r.resize?'':"")+"- '+function(){var e=t.length,i=1,a="";if(e>0)for(a='
- '+(t[0].content||"no content")+" ";i
是否继续查看下一张？",{time:3e4,btn:["下一张","不看了"],yes:function(){u.length>1&&s.imgnext(!0,!0)}})})}},o.run=function(t){i=t,n=i(e),l.html=i("html"),r.open=function(e){var t=new s(e);return t.index}},e.layui&&layui.define?(r.ready(),layui.define("jquery",function(t){r.path=layui.cache.dir,o.run(layui.$),e.layer=r,t("layer",r)})):"function"==typeof define&&define.amd?define(["jquery"],function(){return o.run(e.jQuery),r}):function(){r.ready(),o.run(e.jQuery)}()}(window); \ No newline at end of file diff --git a/package.json b/package.json index 13299b67..b20d94ec 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { - "name": "layui/layer", + "name": "layer-src", "realname": "layer", - "version": "3.4.0", + "version": "3.5.0", "mobile": "2.0.0", "description": "Web 通用弹出层组件", "main": "src/layer.js", diff --git a/src/layer.js b/src/layer.js index 8445813b..57c90986 100644 --- a/src/layer.js +++ b/src/layer.js @@ -1,8 +1,7 @@ -/** - @Name：layer - Web 弹出层组件 - @License：MIT - +/*! + * layer - 通用 Web 弹出层组件 + * MIT Licensed */ ;!function(window, undefined){ @@ -21,8 +20,9 @@ var isLayui = window.layui && layui.define, $, win, ready = { } } return src || js[last].src; - }(); - return jsPath.substring(0, jsPath.lastIndexOf('/') + 1); + }() + ,GLOBAL = window.LAYUI_GLOBAL || {}; + return GLOBAL.layer_dir || jsPath.substring(0, jsPath.lastIndexOf('/') + 1); }(), config: {}, end: {}, minIndex: 0, minLeft: [], @@ -93,7 +93,7 @@ var isLayui = window.layui && layui.define, $, win, ready = { //默认内置方法。 var layer = { - v: '3.4.0', + v: '3.5.0', ie: function(){ //ie版本 var agent = navigator.userAgent.toLowerCase(); return (!!window.ActiveXObject || "ActiveXObject" in window) ? ( @@ -108,6 +108,7 @@ var layer = { layer.path = ready.config.path || layer.path; typeof options.extend === 'string' && (options.extend = [options.extend]); + //如果设置了路径，则加载样式 if(ready.config.path) layer.ready(); if(!options.extend) return this; @@ -203,9 +204,7 @@ var layer = { var Class = function(setings){ var that = this, creat = function(){ - layer.ready(function(){ - that.creat(); - }); + that.creat(); }; that.index = ++layer.index; that.config.maxWidth = $(win).width() - 15*2; //初始最大宽度：当前屏幕宽，左右留 15px 边距 @@ -221,6 +220,9 @@ Class.pt = Class.prototype; var doms = ['layui-layer', '.layui-layer-title', '.layui-layer-main', '.layui-layer-dialog', 'layui-layer-iframe', 'layui-layer-content', 'layui-layer-btn', 'layui-layer-close']; doms.anim = ['layer-anim-00', 'layer-anim-01', 'layer-anim-02', 'layer-anim-03', 'layer-anim-04', 'layer-anim-05', 'layer-anim-06']; +doms.SHADE = 'layui-layer-shade'; +doms.MOVE = 'layui-layer-move'; + //默认配置 Class.pt.config = { type: 0, @@ -235,7 +237,8 @@ Class.pt.config = { zIndex: 19891014, maxWidth: 360, anim: 0, - isOutAnim: true, + isOutAnim: true, //退出动画 + minStack: true, //最小化堆叠 icon: -1, moveType: 1, resize: true, @@ -255,10 +258,10 @@ Class.pt.vessel = function(conType, callback){ config.zIndex = zIndex; callback([ //遮罩 - config.shade ? ('') : '', + config.shade ? ('') : '', //主体 - '
'
+ '
'
+ (conType && config.type != 2 ? '' : titleHTML)
+ '
'
+ (config.type == 0 && config.icon !== -1 ? '' : '')
@@ -279,7 +282,7 @@ Class.pt.vessel = function(conType, callback){
}() : '')
+ (config.resize ? '' : '')
+ '
'
- ], titleHTML, $(''));
+ ], titleHTML, $(''));
return that;
};
@@ -345,21 +348,36 @@ Class.pt.creat = function(){
}
}();
}() : body.append(html[1]);
- $('.layui-layer-move')[0] || body.append(ready.moveElem = moveElem);
+ $('#'+ doms.MOVE)[0] || body.append(ready.moveElem = moveElem);
+
that.layero = $('#'+ doms[0] + times);
+ that.shadeo = $('#'+ doms.SHADE + times);
+
config.scrollbar || doms.html.css('overflow', 'hidden').attr('layer-full', times);
}).auto(times);
//遮罩
- $('#layui-layer-shade'+ that.index).css({
+ that.shadeo.css({
'background-color': config.shade[1] || '#000'
- ,'opacity': config.shade[0]||config.shade
+ ,'opacity': config.shade[0] || config.shade
});
config.type == 2 && layer.ie == 6 && that.layero.find('iframe').attr('src', content[0]);
//坐标自适应浏览器窗口尺寸
- config.type == 4 ? that.tips() : that.offset();
+ config.type == 4 ? that.tips() : function(){
+ that.offset()
+ //首次弹出时，若 css 尚未加载，则等待 css 加载完毕后，重新设定尺寸
+ parseInt(ready.getStyle(document.getElementById(doms.MOVE), 'z-index')) || function(){
+ that.layero.css('visibility', 'hidden');
+ layer.ready(function(){
+ that.offset();
+ that.layero.css('visibility', 'visible');
+ });
+ }();
+ }();
+
+ //如果是固定定位
if(config.fixed){
win.on('resize', function(){
that.offset();
@@ -689,26 +707,26 @@ Class.pt.callback = function(){
//点遮罩关闭
if(config.shadeClose){
- $('#layui-layer-shade'+ that.index).on('click', function(){
+ that.shadeo.on('click', function(){
layer.close(that.index);
});
}
//最小化
layero.find('.layui-layer-min').on('click', function(){
- var min = config.min && config.min(layero);
- min === false || layer.min(that.index, config);
+ var min = config.min && config.min(layero, that.index);
+ min === false || layer.min(that.index, config);
});
//全屏/还原
layero.find('.layui-layer-max').on('click', function(){
if($(this).hasClass('layui-layer-maxmin')){
layer.restore(that.index);
- config.restore && config.restore(layero);
+ config.restore && config.restore(layero, that.index);
} else {
layer.full(that.index, config);
setTimeout(function(){
- config.full && config.full(layero);
+ config.full && config.full(layero, that.index);
}, 100);
}
});
@@ -755,6 +773,7 @@ Class.pt.openLayer = function(){
};
};
+//记录宽高坐标，用于还原
ready.record = function(layero){
var area = [
layero.width(),
@@ -849,11 +868,20 @@ layer.style = function(index, options, limit){
//最小化
layer.min = function(index, options){
+ options = options || {};
var layero = $('#'+ doms[0] + index)
+ ,shadeo = $('#'+ doms.SHADE + index)
,titHeight = layero.find(doms[1]).outerHeight() || 0
,left = layero.attr('minLeft') || (181*ready.minIndex)+'px'
- ,position = layero.css('position');
+ ,position = layero.css('position')
+ ,settings = {
+ width: 180
+ ,height: titHeight
+ ,position: 'fixed'
+ ,overflow: 'hidden'
+ };
+ //记录宽高坐标，用于还原
ready.record(layero);
if(ready.minLeft[0]){
@@ -861,31 +889,33 @@ layer.min = function(index, options){
ready.minLeft.shift();
}
- layero.attr('position', position);
+ //是否堆叠在左下角
+ if(options.minStack){
+ settings.left = left;
+ settings.top = win.height() - titHeight;
+ layero.attr('minLeft') || ready.minIndex++; //初次执行，最小化操作索引自增
+ layero.attr('minLeft', left);
+ }
- layer.style(index, {
- width: 180
- ,height: titHeight
- ,left: left
- ,top: win.height() - titHeight
- ,position: 'fixed'
- ,overflow: 'hidden'
- }, true);
+ layero.attr('position', position);
+ layer.style(index, settings, true);
layero.find('.layui-layer-min').hide();
layero.attr('type') === 'page' && layero.find(doms[4]).hide();
ready.rescollbar(index);
-
- if(!layero.attr('minLeft')){
- ready.minIndex++;
- }
- layero.attr('minLeft', left);
+
+ //隐藏遮罩
+ shadeo.hide();
};
//还原
layer.restore = function(index){
- var layero = $('#'+ doms[0] + index), area = layero.attr('area').split(',');
- var type = layero.attr('type');
+ var layero = $('#'+ doms[0] + index)
+ ,shadeo = $('#'+ doms.SHADE + index)
+ ,area = layero.attr('area').split(',')
+ ,type = layero.attr('type');
+
+ //恢复原来尺寸
layer.style(index, {
width: parseFloat(area[0]),
height: parseFloat(area[1]),
@@ -894,10 +924,14 @@ layer.restore = function(index){
position: layero.attr('position'),
overflow: 'visible'
}, true);
+
layero.find('.layui-layer-max').removeClass('layui-layer-maxmin');
layero.find('.layui-layer-min').show();
layero.attr('type') === 'page' && layero.find(doms[4]).show();
ready.rescollbar(index);
+
+ //恢复遮罩
+ shadeo.show();
};
//全屏
@@ -928,55 +962,53 @@ layer.title = function(name, index){
//关闭layer总方法
layer.close = function(index, callback){
- layer.ready(function(){
- var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
- if(!layero[0]) return;
- var WRAP = 'layui-layer-wrap', remove = function(){
- if(type === ready.type[1] && layero.attr('conType') === 'object'){
- layero.children(':not(.'+ doms[5] +')').remove();
- var wrap = layero.find('.'+WRAP);
- for(var i = 0; i < 2; i++){
- wrap.unwrap();
- }
- wrap.css('display', wrap.data('display')).removeClass(WRAP);
- } else {
- //低版本IE 回收 iframe
- if(type === ready.type[2]){
- try {
- var iframe = $('#'+doms[4]+index)[0];
- iframe.contentWindow.document.write('');
- iframe.contentWindow.close();
- layero.find('.'+doms[5])[0].removeChild(iframe);
- } catch(e){}
- }
- layero[0].innerHTML = '';
- layero.remove();
+ var layero = $('#'+ doms[0] + index), type = layero.attr('type'), closeAnim = 'layer-anim-close';
+ if(!layero[0]) return;
+ var WRAP = 'layui-layer-wrap', remove = function(){
+ if(type === ready.type[1] && layero.attr('conType') === 'object'){
+ layero.children(':not(.'+ doms[5] +')').remove();
+ var wrap = layero.find('.'+WRAP);
+ for(var i = 0; i < 2; i++){
+ wrap.unwrap();
}
- typeof ready.end[index] === 'function' && ready.end[index]();
- delete ready.end[index];
- typeof callback === 'function' && callback();
- };
-
- if(layero.data('isOutAnim')){
- layero.addClass('layer-anim '+ closeAnim);
- }
-
- $('#layui-layer-moves, #layui-layer-shade' + index).remove();
- layer.ie == 6 && ready.reselect();
- ready.rescollbar(index);
- if(layero.attr('minLeft')){
- ready.minIndex--;
- ready.minLeft.push(layero.attr('minLeft'));
- }
-
- if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
- remove()
+ wrap.css('display', wrap.data('display')).removeClass(WRAP);
} else {
- setTimeout(function(){
- remove();
- }, 200);
+ //低版本IE 回收 iframe
+ if(type === ready.type[2]){
+ try {
+ var iframe = $('#'+doms[4]+index)[0];
+ iframe.contentWindow.document.write('');
+ iframe.contentWindow.close();
+ layero.find('.'+doms[5])[0].removeChild(iframe);
+ } catch(e){}
+ }
+ layero[0].innerHTML = '';
+ layero.remove();
}
- });
+ typeof ready.end[index] === 'function' && ready.end[index]();
+ delete ready.end[index];
+ typeof callback === 'function' && callback();
+ };
+
+ if(layero.data('isOutAnim')){
+ layero.addClass('layer-anim '+ closeAnim);
+ }
+
+ $('#layui-layer-moves, #'+ doms.SHADE + index).remove();
+ layer.ie == 6 && ready.reselect();
+ ready.rescollbar(index);
+ if(layero.attr('minLeft')){
+ ready.minIndex--;
+ ready.minLeft.push(layero.attr('minLeft'));
+ }
+
+ if((layer.ie && layer.ie < 10) || !layero.data('isOutAnim')){
+ remove()
+ } else {
+ setTimeout(function(){
+ remove();
+ }, 200);
+ }
};
//关闭所有层
@@ -985,16 +1017,14 @@ layer.closeAll = function(type, callback){
callback = type;
type = null;
};
- layer.ready(function(){
- var domsElem = $('.'+doms[0]);
- $.each(domsElem, function(_index){
- var othis = $(this);
- var is = type ? (othis.attr('type') === type) : 1;
- is && layer.close(othis.attr('times'), _index === domsElem.length - 1 ? callback : null);
- is = null;
- });
- if(domsElem.length === 0) typeof callback === 'function' && callback();
+ var domsElem = $('.'+doms[0]);
+ $.each(domsElem, function(_index){
+ var othis = $(this);
+ var is = type ? (othis.attr('type') === type) : 1;
+ is && layer.close(othis.attr('times'), _index === domsElem.length - 1 ? callback : null);
+ is = null;
});
+ if(domsElem.length === 0) typeof callback === 'function' && callback();
};
/**