update

2016-05-18 14:25:47 +08:00 · 2016-05-18 14:25:47 +08:00 · ea5e818a7d
parent 51c0b8c0c3
commit ea5e818a7d
13 changed files with 347 additions and 355 deletions
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -1,4 +1,11 @@
-【2.2】2015.03.18
+【2.2】2016.05.18
+* 通过对使用频率的调查，将layer.ext.js（拓展模块）合并到了layer.js，即不用再通过layer.config来加载调用。
+* cancel回调不再对第二个按钮有效，只作为右上角关闭按钮触发。并且除yes回调外，所以按钮的回调都可以通过return false来设定不默认关闭。
+* 修复相册层，点击任意图片查看，弹出的并非当前图片的bug。
+* 修复相册层在移动端显示不佳的bug。
+* 修复msg、alert等对话框类型的弹层，在手机使用时未水平居中的bug。
+
+【2.2】2015.03.18
 * 增加参数id，用于控制弹层唯一标识。如不想重复弹出，可设置该值。
 * layer.tips允许出现遮罩，即不对shade参数做限制。
 * 对layer.photos方法直接弹出页面图片进行了事件委托，修复了之前由于动态插入的img而无法执行弹出的bug，并且修复了当图片信息改变时，仍然弹出了之前的图片的bug
--- a/GruntFile.js
+++ b/GruntFile.js
@ -16,13 +16,6 @@
        src: './src/layer.js',  
        dest: './layer.js'
      },
-      'layer.ext.js': {
-        options: {
-           banner: '/*! layer<%= pkg.description %>拓展类 */\n;'
-        },
-        src: './src/extend/layer.ext.js',  
-        dest: './extend/layer.ext.js'
-      },
      'layer.mobile.js': {
        options: {
           banner: '/*! layer mobile-v<%= pkg.mobile %> <%= pkg.description %>移动版 License LGPL <%= pkg.homepage %>mobile By <%= pkg.author %> */\n;'
--- a/extend/layer.ext.js
+++ b/extend/layer.ext.js
@ -1,2 +0,0 @@
-/*! layer弹层组件拓展类 */
-;!function(){layer.use("skin/layer.ext.css",function(){layer.layui_layer_extendlayerextjs=!0});var a=layer.cache||{},b=function(b){return a.skin?" "+a.skin+" "+a.skin+"-"+b:""};layer.prompt=function(a,c){a=a||{},"function"==typeof a&&(c=a);var d,e=2==a.formType?'<textarea class="layui-layer-input">'+(a.value||"")+"</textarea>":function(){return'<input type="'+(1==a.formType?"password":"text")+'" class="layui-layer-input" value="'+(a.value||"")+'">'}();return layer.open($.extend({btn:["&#x786E;&#x5B9A;","&#x53D6;&#x6D88;"],content:e,skin:"layui-layer-prompt"+b("prompt"),success:function(a){d=a.find(".layui-layer-input"),d.focus()},yes:function(b){var e=d.val();""===e?d.focus():e.length>(a.maxlength||500)?layer.tips("&#x6700;&#x591A;&#x8F93;&#x5165;"+(a.maxlength||500)+"&#x4E2A;&#x5B57;&#x6570;",d,{tips:1}):c&&c(e,b,d)}},a))},layer.tab=function(a){a=a||{};var c=a.tab||{};return layer.open($.extend({type:1,skin:"layui-layer-tab"+b("tab"),title:function(){var a=c.length,b=1,d="";if(a>0)for(d='<span class="layui-layer-tabnow">'+c[0].title+"</span>";a>b;b++)d+="<span>"+c[b].title+"</span>";return d}(),content:'<ul class="layui-layer-tabmain">'+function(){var a=c.length,b=1,d="";if(a>0)for(d='<li class="layui-layer-tabli xubox_tab_layer">'+(c[0].content||"no content")+"</li>";a>b;b++)d+='<li class="layui-layer-tabli">'+(c[b].content||"no  content")+"</li>";return d}()+"</ul>",success:function(b){var c=b.find(".layui-layer-title").children(),d=b.find(".layui-layer-tabmain").children();c.on("mousedown",function(b){b.stopPropagation?b.stopPropagation():b.cancelBubble=!0;var c=$(this),e=c.index();c.addClass("layui-layer-tabnow").siblings().removeClass("layui-layer-tabnow"),d.eq(e).show().siblings().hide(),"function"==typeof a.change&&a.change(e)})}},a))},layer.photos=function(a,c,d){function e(a,b,c){var d=new Image;d.onload=function(){d.onload=null,b(d)},d.onerror=function(a){d.onerror=null,c(a)},d.src=a}var f={};if(a=a||{},a.photos){var g=a.photos.constructor===Object,h=g?a.photos:{},i=h.data||[],j=h.start||0;if(f.imgIndex=j+1,g){if(0===i.length)return layer.msg("&#x6CA1;&#x6709;&#x56FE;&#x7247;")}else{var k=$(a.photos),l=function(){return i=[],k.find(a.img||"img").each(function(a){var b=$(this);i.push({alt:b.attr("alt"),pid:b.attr("layer-pid"),src:b.attr("layer-src")||b.attr("src"),thumb:b.attr("src")})}),arguments.callee}();if(0===i.length)return;if(c||k.on("click",a.img||"img",function(){var b=$(this),c=b.index();l(),layer.photos($.extend(a,{photos:{start:c,data:i,tab:a.tab},full:a.full}),!0)}),!c)return}f.imgprev=function(a){f.imgIndex--,f.imgIndex<1&&(f.imgIndex=i.length),f.tabimg(a)},f.imgnext=function(a,b){f.imgIndex++,f.imgIndex>i.length&&(f.imgIndex=1,b)||f.tabimg(a)},f.keyup=function(a){if(!f.end){var b=a.keyCode;a.preventDefault(),37===b?f.imgprev(!0):39===b?f.imgnext(!0):27===b&&layer.close(f.index)}},f.tabimg=function(b){i.length<=1||(h.start=f.imgIndex-1,layer.close(f.index),layer.photos(a,!0,b))},f.event=function(){f.bigimg.hover(function(){f.imgsee.show()},function(){f.imgsee.hide()}),f.bigimg.find(".layui-layer-imgprev").on("click",function(a){a.preventDefault(),f.imgprev()}),f.bigimg.find(".layui-layer-imgnext").on("click",function(a){a.preventDefault(),f.imgnext()}),$(document).on("keyup",f.keyup)},f.loadi=layer.load(1,{shade:"shade"in a?!1:.9,scrollbar:!1}),e(i[j].src,function(c){layer.close(f.loadi),f.index=layer.open($.extend({type:1,area:function(){var b=[c.width,c.height],d=[$(window).width()-100,$(window).height()-100];return!a.full&&b[0]>d[0]&&(b[0]=d[0],b[1]=b[0]*d[1]/b[0]),[b[0]+"px",b[1]+"px"]}(),title:!1,shade:.9,shadeClose:!0,closeBtn:!1,move:".layui-layer-phimg img",moveType:1,scrollbar:!1,moveOut:!0,shift:5*Math.random()|0,skin:"layui-layer-photos"+b("photos"),content:'<div class="layui-layer-phimg"><img src="'+i[j].src+'" alt="'+(i[j].alt||"")+'" layer-pid="'+i[j].pid+'"><div class="layui-layer-imgsee">'+(i.length>1?'<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>':"")+'<div class="layui-layer-imgbar" style="display:'+(d?"block":"")+'"><span class="layui-layer-imgtit"><a href="javascript:;">'+(i[j].alt||"")+"</a><em>"+f.imgIndex+"/"+i.length+"</em></span></div></div></div>",success:function(b,c){f.bigimg=b.find(".layui-layer-phimg"),f.imgsee=b.find(".layui-layer-imguide,.layui-layer-imgbar"),f.event(b),a.tab&&a.tab(i[j],b)},end:function(){f.end=!0,$(document).off("keyup",f.keyup)}},a))},function(){layer.close(f.loadi),layer.msg("&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;",{time:3e4,btn:["下一张","不看了"],yes:function(){i.length>1&&f.imgnext(!0,!0)}})})}}}();
--- a/layer.js
+++ b/layer.js
--- a/mobile/layer.js
+++ b/mobile/layer.js
@ -1,2 +1,2 @@
-/*! layer mobile-v1.7 弹层组件移动版 License LGPL http://layer.layui.com/mobile By 贤心 */
+/*! layer mobile-v1.8 弹层组件移动版 License LGPL http://layer.layui.com/mobile By 贤心 */
 ;!function(a){"use strict";var b=document,c="querySelectorAll",d="getElementsByClassName",e=function(a){return b[c](a)},f={type:0,shade:!0,shadeClose:!0,fixed:!0,anim:!0},g={extend:function(a){var b=JSON.parse(JSON.stringify(f));for(var c in a)b[c]=a[c];return b},timer:{},end:{}};g.touch=function(a,b){var c;return/Android|iPhone|SymbianOS|Windows Phone|iPad|iPod/.test(navigator.userAgent)?(a.addEventListener("touchmove",function(){c=!0},!1),void a.addEventListener("touchend",function(a){a.preventDefault(),c||b.call(this,a),c=!1},!1)):a.addEventListener("click",function(a){b.call(this,a)},!1)};var h=0,i=["layermbox"],j=function(a){var b=this;b.config=g.extend(a),b.view()};j.prototype.view=function(){var a=this,c=a.config,f=b.createElement("div");a.id=f.id=i[0]+h,f.setAttribute("class",i[0]+" "+i[0]+(c.type||0)),f.setAttribute("index",h);var g=function(){var a="object"==typeof c.title;return c.title?'<h3 style="'+(a?c.title[1]:"")+'">'+(a?c.title[0]:c.title)+'</h3><button class="layermend"></button>':""}(),j=function(){var a,b=(c.btn||[]).length;return 0!==b&&c.btn?(a='<span type="1">'+c.btn[0]+"</span>",2===b&&(a='<span type="0">'+c.btn[1]+"</span>"+a),'<div class="layermbtn">'+a+"</div>"):""}();if(c.fixed||(c.top=c.hasOwnProperty("top")?c.top:100,c.style=c.style||"",c.style+=" top:"+(b.body.scrollTop+c.top)+"px"),2===c.type&&(c.content='<i></i><i class="laymloadtwo"></i><i></i>'),f.innerHTML=(c.shade?"<div "+("string"==typeof c.shade?'style="'+c.shade+'"':"")+' class="laymshade"></div>':"")+'<div class="layermmain" '+(c.fixed?"":'style="position:static;"')+'><div class="section"><div class="layermchild '+(c.className?c.className:"")+" "+(c.type||c.shade?"":"layermborder ")+(c.anim?"layermanim":"")+'" '+(c.style?'style="'+c.style+'"':"")+">"+g+'<div class="layermcont">'+c.content+"</div>"+j+"</div></div></div>",!c.type||2===c.type){var k=b[d](i[0]+c.type),l=k.length;l>=1&&layer.close(k[0].getAttribute("index"))}document.body.appendChild(f);var m=a.elem=e("#"+a.id)[0];c.success&&c.success(m),a.index=h++,a.action(c,m)},j.prototype.action=function(a,b){var c=this;if(a.time&&(g.timer[c.index]=setTimeout(function(){layer.close(c.index)},1e3*a.time)),a.title){var e=b[d]("layermend")[0],f=function(){a.cancel&&a.cancel(),layer.close(c.index)};g.touch(e,f)}var h=function(){var b=this.getAttribute("type");0==b?(a.no&&a.no(),layer.close(c.index)):a.yes?a.yes(c.index):layer.close(c.index)};if(a.btn)for(var i=b[d]("layermbtn")[0].children,j=i.length,k=0;j>k;k++)g.touch(i[k],h);if(a.shade&&a.shadeClose){var l=b[d]("laymshade")[0];g.touch(l,function(){layer.close(c.index,a.end)})}a.end&&(g.end[c.index]=a.end)},a.layer={v:"1.8",index:h,open:function(a){var b=new j(a||{});return b.index},close:function(a){var c=e("#"+i[0]+a)[0];c&&(c.innerHTML="",b.body.removeChild(c),clearTimeout(g.timer[a]),delete g.timer[a],"function"==typeof g.end[a]&&g.end[a](),delete g.end[a])},closeAll:function(){for(var a=b[d](i[0]),c=0,e=a.length;e>c;c++)layer.close(0|a[0].getAttribute("index"))}},"function"==typeof define?define(function(){return layer}):function(){var a=document.scripts,c=a[a.length-1],d=c.src,e=d.substring(0,d.lastIndexOf("/")+1);c.getAttribute("merge")||document.head.appendChild(function(){var a=b.createElement("link");return a.href=e+"need/layer.css",a.type="text/css",a.rel="styleSheet",a.id="layermcss",a}())}()}(window);
--- a/package.json
+++ b/package.json
@ -1,7 +1,7 @@
 {
  "name": "layer",
-  "version": "2.2",
-  "mobile": "1.7",
+  "version": "2.3",
+  "mobile": "1.8",
  "description": "弹层组件",
  "main": "",
  "scripts": {
--- a/skin/layer.css
+++ b/skin/layer.css
--- a/skin/layer.ext.css
+++ b/skin/layer.ext.css
@ -1,8 +0,0 @@
-/*!
- 
- @Name: layer拓展样式
- @Date: 2012.12.13
- @Author: 贤心
- @blog: sentsin.com
- 
- */.layui-layer-imgbar,.layui-layer-imgtit a,.layui-layer-tab .layui-layer-title span{text-overflow:ellipsis;white-space:nowrap}.layui-layer-iconext{background:url(default/icon-ext.png) no-repeat}html #layui_layer_skinlayerextcss{display:none;position:absolute;width:1989px}.layui-layer-prompt .layui-layer-input{display:block;width:220px;height:30px;margin:0 auto;line-height:30px;padding:0 5px;border:1px solid #ccc;box-shadow:1px 1px 5px rgba(0,0,0,.1) inset;color:#333}.layui-layer-prompt textarea.layui-layer-input{width:300px;height:100px;line-height:20px}.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4)}.layui-layer-tab .layui-layer-title{padding-left:0;border-bottom:1px solid #ccc;background-color:#eee;overflow:visible}.layui-layer-tab .layui-layer-title span{position:relative;float:left;min-width:80px;max-width:260px;padding:0 20px;text-align:center;cursor:default;overflow:hidden}.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px;border-left:1px solid #ccc;border-right:1px solid #ccc;background-color:#fff;z-index:10}.layui-layer-tab .layui-layer-title span:first-child{border-left:none}.layui-layer-tabmain{line-height:24px;clear:both}.layui-layer-tabmain .layui-layer-tabli{display:none}.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block}.xubox_tabclose{position:absolute;right:10px;top:5px;cursor:pointer}.layui-layer-photos{-webkit-animation-duration:1s;animation-duration:1s}.layui-layer-photos .layui-layer-content{overflow:hidden;text-align:center}.layui-layer-photos .layui-layer-phimg img{position:relative;width:100%;display:inline-block;*display:inline;*zoom:1;vertical-align:top}.layui-layer-imgbar,.layui-layer-imguide{display:none}.layui-layer-imgnext,.layui-layer-imgprev{position:absolute;top:50%;width:27px;_width:44px;height:44px;margin-top:-22px;outline:0;blr:expression(this.onFocus=this.blur())}.layui-layer-imgprev{left:10px;background-position:-5px -5px;_background-position:-70px -5px}.layui-layer-imgprev:hover{background-position:-33px -5px;_background-position:-120px -5px}.layui-layer-imgnext{right:10px;_right:8px;background-position:-5px -50px;_background-position:-70px -50px}.layui-layer-imgnext:hover{background-position:-33px -50px;_background-position:-120px -50px}.layui-layer-imgbar{position:absolute;left:0;bottom:0;width:100%;height:32px;line-height:32px;background-color:rgba(0,0,0,.8);background-color:#000\9;filter:Alpha(opacity=80);color:#fff;overflow:hidden;font-size:0}.layui-layer-imgtit *{display:inline-block;*display:inline;*zoom:1;vertical-align:top;font-size:12px}.layui-layer-imgtit a{max-width:65%;overflow:hidden;color:#fff}.layui-layer-imgtit a:hover{color:#fff;text-decoration:underline}.layui-layer-imgtit em{padding-left:10px;font-style:normal}
--- a/src/extend/layer.ext.js
+++ b/src/extend/layer.ext.js
@ -1,267 +0,0 @@
-/*!
- 
- @Name: layer extend 弹层扩展
- @Author: 贤心
- @Site：http://layer.layui.com
-
- */
- 
-;!function(){
- 
-layer.use('skin/layer.ext.css', function(){
-  layer.layui_layer_extendlayerextjs = true;
-});
-
-var cache = layer.cache||{}, skin = function(type){
-  return (cache.skin ? (' ' + cache.skin + ' ' + cache.skin + '-'+type) : '');
-}
-
-//仿系统prompt
-layer.prompt = function(options, yes){
-  options = options || {};
-  if(typeof options === 'function') yes = options;
-  var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input">'+ (options.value||'') +'</textarea>' : function(){
-    return '<input type="'+ (options.formType == 1 ? 'password' : 'text') +'" class="layui-layer-input" value="'+ (options.value||'') +'">';
-  }();
-  return layer.open($.extend({
-    btn: ['&#x786E;&#x5B9A;','&#x53D6;&#x6D88;'],
-    content: content,
-    skin: 'layui-layer-prompt' + skin('prompt'),
-    success: function(layero){
-      prompt = layero.find('.layui-layer-input');
-      prompt.focus();
-    }, yes: function(index){
-      var value = prompt.val();
-      if(value === ''){
-        prompt.focus();
-      } else if(value.length > (options.maxlength||500)) {
-        layer.tips('&#x6700;&#x591A;&#x8F93;&#x5165;'+ (options.maxlength || 500) +'&#x4E2A;&#x5B57;&#x6570;', prompt, {tips: 1});
-      } else {
-        yes && yes(value, index, prompt);
-      }
-    }
-  }, options));
-};
-
-//tab层
-layer.tab = function(options){
-  options = options || {};
-  var tab = options.tab || {};
-  return layer.open($.extend({
-    type: 1,
-    skin: 'layui-layer-tab' + skin('tab'),
-    title: function(){
-      var len = tab.length, ii = 1, str = '';
-      if(len > 0){
-        str = '<span class="layui-layer-tabnow">'+ tab[0].title +'</span>';
-        for(; ii < len; ii++){
-          str += '<span>'+ tab[ii].title +'</span>';
-        }
-      }
-      return str;
-    }(),
-    content: '<ul class="layui-layer-tabmain">'+ function(){
-      var len = tab.length, ii = 1, str = '';
-      if(len > 0){
-        str = '<li class="layui-layer-tabli xubox_tab_layer">'+ (tab[0].content || 'no content') +'</li>';
-        for(; ii < len; ii++){
-          str += '<li class="layui-layer-tabli">'+ (tab[ii].content || 'no  content') +'</li>';
-        }
-      }
-      return str;
-    }() +'</ul>',
-    success: function(layero){
-      var btn = layero.find('.layui-layer-title').children();
-      var main = layero.find('.layui-layer-tabmain').children();
-      btn.on('mousedown', function(e){
-        e.stopPropagation ? e.stopPropagation() : e.cancelBubble = true;
-        var othis = $(this), index = othis.index();
-        othis.addClass('layui-layer-tabnow').siblings().removeClass('layui-layer-tabnow');
-        main.eq(index).show().siblings().hide();
-        typeof options.change === 'function' && options.change(index);
-      });
-    }
-  }, options));
-};
-
-//相册层
-layer.photos = function(options, loop, key){
-  var dict = {};
-  options = options || {};
-  if(!options.photos) return;
-  var type = options.photos.constructor === Object;
-  var photos = type ? options.photos : {}, data = photos.data || [];
-  var start = photos.start || 0;
-  dict.imgIndex = start + 1;
-
-  if(!type){ //页面直接获取
-    var parent = $(options.photos), pushData = function(){
-      data = [];
-      parent.find(options.img||'img').each(function(index){
-        var othis = $(this);
-        data.push({
-          alt: othis.attr('alt'),
-          pid: othis.attr('layer-pid'),
-          src: othis.attr('layer-src') || othis.attr('src'),
-          thumb: othis.attr('src')
-        });
-      })
-      return arguments.callee;
-    }();
-    
-    if (data.length === 0) return;
-    
-    loop || parent.on('click', options.img||'img', function(){
-      var othis = $(this), index = othis.index();
-      pushData();
-      layer.photos($.extend(options, {
-        photos: {
-          start: index,
-          data: data,
-          tab: options.tab
-        },
-        full: options.full
-      }), true);
-    })
-    
-    //不直接弹出
-    if(!loop) return;
-    
-  } else if (data.length === 0){
-    return layer.msg('&#x6CA1;&#x6709;&#x56FE;&#x7247;');
-  }
-  
-  //上一张
-  dict.imgprev = function(key){
-    dict.imgIndex--;
-    if(dict.imgIndex < 1){
-      dict.imgIndex = data.length;
-    }
-    dict.tabimg(key);
-  };
-  
-  //下一张
-  dict.imgnext = function(key,errorMsg){
-    dict.imgIndex++;
-    if(dict.imgIndex > data.length){
-      dict.imgIndex = 1;
-      if (errorMsg) {return};
-    }
-    dict.tabimg(key)
-  };
-  
-  //方向键
-  dict.keyup = function(event){
-    if(!dict.end){
-      var code = event.keyCode;
-      event.preventDefault();
-      if(code === 37){
-        dict.imgprev(true);
-      } else if(code === 39) {
-        dict.imgnext(true);
-      } else if(code === 27) {
-        layer.close(dict.index);
-      }
-    }
-  }
-  
-  //切换
-  dict.tabimg = function(key){
-    if(data.length <= 1) return;
-    photos.start = dict.imgIndex - 1;
-    layer.close(dict.index);
-    layer.photos(options, true, key);
-  }
-  
-  //一些动作
-  dict.event = function(){
-    dict.bigimg.hover(function(){
-      dict.imgsee.show();
-    }, function(){
-      dict.imgsee.hide();
-    });
-    
-    dict.bigimg.find('.layui-layer-imgprev').on('click', function(event){
-      event.preventDefault();
-      dict.imgprev();
-    });  
-    
-    dict.bigimg.find('.layui-layer-imgnext').on('click', function(event){     
-      event.preventDefault();
-      dict.imgnext();
-    });
-    
-    $(document).on('keyup', dict.keyup);
-  };
-  
-  //图片预加载
-  function loadImage(url, callback, error) {   
-    var img = new Image();  
-    img.onload = function(){
-      img.onload = null;
-      callback(img);
-    };
-    img.onerror = function(e){
-      img.onerror = null;
-      error(e);
-    };
-    img.src = url; 
-  };
-  
-  dict.loadi = layer.load(1, {
-    shade: 'shade' in options ? false : 0.9,
-    scrollbar: false
-  });
-  loadImage(data[start].src, function(img){
-    layer.close(dict.loadi);
-    dict.index = layer.open($.extend({
-      type: 1,
-      area: function(){
-         var imgarea = [img.width, img.height];
-         var winarea = [$(window).width() - 100, $(window).height() - 100];
-         if(!options.full && imgarea[0] > winarea[0]){
-           imgarea[0] = winarea[0];
-           imgarea[1] = imgarea[0]*winarea[1]/imgarea[0];
-         }
-         return [imgarea[0]+'px', imgarea[1]+'px']; 
-      }(),
-      title: false,
-      shade: 0.9,
-      shadeClose: true,
-      closeBtn: false,
-      move: '.layui-layer-phimg img',
-      moveType: 1,
-      scrollbar: false,
-      moveOut: true,
-      shift: Math.random()*5|0,
-      skin: 'layui-layer-photos' + skin('photos'),
-      content: '<div class="layui-layer-phimg">'
-        +'<img src="'+ data[start].src +'" alt="'+ (data[start].alt||'') +'" layer-pid="'+ data[start].pid +'">'
-        +'<div class="layui-layer-imgsee">'
-          +(data.length > 1 ? '<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>' : '')
-          +'<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><a href="javascript:;">'+ (data[start].alt||'') +'</a><em>'+ dict.imgIndex +'/'+ data.length +'</em></span></div>'
-        +'</div>'
-      +'</div>',
-      success: function(layero, index){
-        dict.bigimg = layero.find('.layui-layer-phimg');
-        dict.imgsee = layero.find('.layui-layer-imguide,.layui-layer-imgbar');
-        dict.event(layero);
-        options.tab && options.tab(data[start], layero);
-      }, end: function(){
-        dict.end = true;
-        $(document).off('keyup', dict.keyup);
-      }
-    }, options));
-  }, function(){
-    layer.close(dict.loadi);
-    layer.msg('&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;', {
-      time: 30000, 
-      btn: ['下一张', '不看了'], 
-      yes: function(){
-        data.length > 1 && dict.imgnext(true,true);
-      }
-    });
-  });
-};
-
-}();
--- a/src/layer.js
+++ b/src/layer.js
@ -1,6 +1,6 @@
 /*!

- @Name：layer v2.2 弹层组件
+ @Name：layer v2.3 弹层组件
 @Author：贤心
 @Site：http://layer.layui.com
 @License：LGPL
@ -30,7 +30,7 @@ var $, win, ready = {

 //默认内置方法。
 var layer = {
-  v: '2.2',
+  v: '2.3',
  ie6: !!window.ActiveXObject&&!window.XMLHttpRequest,
  index: 0,
  path: ready.getPath,
@ -105,7 +105,7 @@ var layer = {
      content: content,
      btn: ready.btn,
      yes: yes,
-      cancel: cancel
+      btn2: cancel
    }, type ? {} : options));
  },
  
@ -166,7 +166,7 @@ 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 = ['layui-anim', 'layui-anim-01', 'layui-anim-02', 'layui-anim-03', 'layui-anim-04', 'layui-anim-05', 'layui-anim-06'];
+doms.anim = ['layer-anim', 'layer-anim-01', 'layer-anim-02', 'layer-anim-03', 'layer-anim-04', 'layer-anim-05', 'layer-anim-06'];

 //默认配置
 Class.pt.config = {
@ -519,19 +519,23 @@ Class.pt.callback = function(){
  //按钮
  layero.find('.'+ doms[6]).children('a').on('click', function(){
    var index = $(this).index();
-    config['btn'+(index+1)] && config['btn'+(index+1)](that.index, layero);
    if(index === 0){
-      config.yes ? config.yes(that.index, layero) : layer.close(that.index);
-    } else if(index === 1){
-      cancel();
+      if(config.yes){
+        config.yes(that.index, layero)
+      } else if(config['btn1']){
+        config['btn1'](that.index, layero)
+      } else {
+        layer.close(that.index);
+      }
    } else {
-      config['btn'+(index+1)] || layer.close(that.index);
+      var close = config['btn'+(index+1)] && config['btn'+(index+1)](that.index, layero);
+      close === false || layer.close(that.index);
    }
  });
  
  //取消
  function cancel(){
-    var close = config.cancel && config.cancel(that.index);
+    var close = config.cancel && config.cancel(that.index, layero);
    close === false || layer.close(that.index);
  }
  
@ -775,6 +779,271 @@ layer.closeAll = function(type){
  });
 };

+/** 
+
+  拓展模块，layui开始合并在一起
+
+ */
+
+var cache = layer.cache||{}, skin = function(type){
+  return (cache.skin ? (' ' + cache.skin + ' ' + cache.skin + '-'+type) : '');
+}; 
+ 
+//仿系统prompt
+layer.prompt = function(options, yes){
+  options = options || {};
+  if(typeof options === 'function') yes = options;
+  var prompt, content = options.formType == 2 ? '<textarea class="layui-layer-input">'+ (options.value||'') +'</textarea>' : function(){
+    return '<input type="'+ (options.formType == 1 ? 'password' : 'text') +'" class="layui-layer-input" value="'+ (options.value||'') +'">';
+  }();
+  return layer.open($.extend({
+    btn: ['&#x786E;&#x5B9A;','&#x53D6;&#x6D88;'],
+    content: content,
+    skin: 'layui-layer-prompt' + skin('prompt'),
+    success: function(layero){
+      prompt = layero.find('.layui-layer-input');
+      prompt.focus();
+    }, yes: function(index){
+      var value = prompt.val();
+      if(value === ''){
+        prompt.focus();
+      } else if(value.length > (options.maxlength||500)) {
+        layer.tips('&#x6700;&#x591A;&#x8F93;&#x5165;'+ (options.maxlength || 500) +'&#x4E2A;&#x5B57;&#x6570;', prompt, {tips: 1});
+      } else {
+        yes && yes(value, index, prompt);
+      }
+    }
+  }, options));
+};
+
+//tab层
+layer.tab = function(options){
+  options = options || {};
+  var tab = options.tab || {};
+  return layer.open($.extend({
+    type: 1,
+    skin: 'layui-layer-tab' + skin('tab'),
+    title: function(){
+      var len = tab.length, ii = 1, str = '';
+      if(len > 0){
+        str = '<span class="layui-layer-tabnow">'+ tab[0].title +'</span>';
+        for(; ii < len; ii++){
+          str += '<span>'+ tab[ii].title +'</span>';
+        }
+      }
+      return str;
+    }(),
+    content: '<ul class="layui-layer-tabmain">'+ function(){
+      var len = tab.length, ii = 1, str = '';
+      if(len > 0){
+        str = '<li class="layui-layer-tabli xubox_tab_layer">'+ (tab[0].content || 'no content') +'</li>';
+        for(; ii < len; ii++){
+          str += '<li class="layui-layer-tabli">'+ (tab[ii].content || 'no  content') +'</li>';
+        }
+      }
+      return str;
+    }() +'</ul>',
+    success: function(layero){
+      var btn = layero.find('.layui-layer-title').children();
+      var main = layero.find('.layui-layer-tabmain').children();
+      btn.on('mousedown', function(e){
+        e.stopPropagation ? e.stopPropagation() : e.cancelBubble = true;
+        var othis = $(this), index = othis.index();
+        othis.addClass('layui-layer-tabnow').siblings().removeClass('layui-layer-tabnow');
+        main.eq(index).show().siblings().hide();
+        typeof options.change === 'function' && options.change(index);
+      });
+    }
+  }, options));
+};
+
+//相册层
+layer.photos = function(options, loop, key){
+  var dict = {};
+  options = options || {};
+  if(!options.photos) return;
+  var type = options.photos.constructor === Object;
+  var photos = type ? options.photos : {}, data = photos.data || [];
+  var start = photos.start || 0;
+  dict.imgIndex = start + 1;
+  
+  options.img = options.img || 'img';
+
+  if(!type){ //页面直接获取
+    var parent = $(options.photos), pushData = function(){
+      data = [];
+      parent.find(options.img).each(function(index){
+        var othis = $(this);
+        othis.attr('layer-index', index);
+        data.push({
+          alt: othis.attr('alt'),
+          pid: othis.attr('layer-pid'),
+          src: othis.attr('layer-src') || othis.attr('src'),
+          thumb: othis.attr('src')
+        });
+      })
+    };
+    
+    pushData();
+    
+    if (data.length === 0) return;
+    
+    loop || parent.on('click', options.img, function(){
+      var othis = $(this), index = othis.attr('layer-index'); 
+      layer.photos($.extend(options, {
+        photos: {
+          start: index,
+          data: data,
+          tab: options.tab
+        },
+        full: options.full
+      }), true);
+      pushData();
+    })
+    
+    //不直接弹出
+    if(!loop) return;
+    
+  } else if (data.length === 0){
+    return layer.msg('&#x6CA1;&#x6709;&#x56FE;&#x7247;');
+  }
+  
+  //上一张
+  dict.imgprev = function(key){
+    dict.imgIndex--;
+    if(dict.imgIndex < 1){
+      dict.imgIndex = data.length;
+    }
+    dict.tabimg(key);
+  };
+  
+  //下一张
+  dict.imgnext = function(key,errorMsg){
+    dict.imgIndex++;
+    if(dict.imgIndex > data.length){
+      dict.imgIndex = 1;
+      if (errorMsg) {return};
+    }
+    dict.tabimg(key)
+  };
+  
+  //方向键
+  dict.keyup = function(event){
+    if(!dict.end){
+      var code = event.keyCode;
+      event.preventDefault();
+      if(code === 37){
+        dict.imgprev(true);
+      } else if(code === 39) {
+        dict.imgnext(true);
+      } else if(code === 27) {
+        layer.close(dict.index);
+      }
+    }
+  }
+  
+  //切换
+  dict.tabimg = function(key){
+    if(data.length <= 1) return;
+    photos.start = dict.imgIndex - 1;
+    layer.close(dict.index);
+    layer.photos(options, true, key);
+  }
+  
+  //一些动作
+  dict.event = function(){
+    dict.bigimg.hover(function(){
+      dict.imgsee.show();
+    }, function(){
+      dict.imgsee.hide();
+    });
+    
+    dict.bigimg.find('.layui-layer-imgprev').on('click', function(event){
+      event.preventDefault();
+      dict.imgprev();
+    });  
+    
+    dict.bigimg.find('.layui-layer-imgnext').on('click', function(event){     
+      event.preventDefault();
+      dict.imgnext();
+    });
+    
+    $(document).on('keyup', dict.keyup);
+  };
+  
+  //图片预加载
+  function loadImage(url, callback, error) {   
+    var img = new Image();
+    img.src = url; 
+    if(img.complete){
+      return callback(img);
+    }
+    img.onload = function(){
+      img.onload = null;
+      callback(img);
+    };
+    img.onerror = function(e){
+      img.onerror = null;
+      error(e);
+    };  
+  };
+  
+  dict.loadi = layer.load(1, {
+    shade: 'shade' in options ? false : 0.9,
+    scrollbar: false
+  });
+  loadImage(data[start].src, function(img){
+    layer.close(dict.loadi);
+    dict.index = layer.open($.extend({
+      type: 1,
+      area: function(){
+         var imgarea = [img.width, img.height];
+         var winarea = [$(window).width() - 50, $(window).height() - 50];
+         if(!options.full && imgarea[0] > winarea[0]){
+           imgarea[0] = winarea[0];
+           imgarea[1] = imgarea[0]*img.height/img.width;
+         }
+         return [imgarea[0]+'px', imgarea[1]+'px']; 
+      }(),
+      title: false,
+      shade: 0.9,
+      shadeClose: true,
+      closeBtn: false,
+      move: '.layui-layer-phimg img',
+      moveType: 1,
+      scrollbar: false,
+      moveOut: true,
+      shift: Math.random()*5|0,
+      skin: 'layui-layer-photos' + skin('photos'),
+      content: '<div class="layui-layer-phimg">'
+        +'<img src="'+ data[start].src +'" alt="'+ (data[start].alt||'') +'" layer-pid="'+ data[start].pid +'">'
+        +'<div class="layui-layer-imgsee">'
+          +(data.length > 1 ? '<span class="layui-layer-imguide"><a href="javascript:;" class="layui-layer-iconext layui-layer-imgprev"></a><a href="javascript:;" class="layui-layer-iconext layui-layer-imgnext"></a></span>' : '')
+          +'<div class="layui-layer-imgbar" style="display:'+ (key ? 'block' : '') +'"><span class="layui-layer-imgtit"><a href="javascript:;">'+ (data[start].alt||'') +'</a><em>'+ dict.imgIndex +'/'+ data.length +'</em></span></div>'
+        +'</div>'
+      +'</div>',
+      success: function(layero, index){
+        dict.bigimg = layero.find('.layui-layer-phimg');
+        dict.imgsee = layero.find('.layui-layer-imguide,.layui-layer-imgbar');
+        dict.event(layero);
+        options.tab && options.tab(data[start], layero);
+      }, end: function(){
+        dict.end = true;
+        $(document).off('keyup', dict.keyup);
+      }
+    }, options));
+  }, function(){
+    layer.close(dict.loadi);
+    layer.msg('&#x5F53;&#x524D;&#x56FE;&#x7247;&#x5730;&#x5740;&#x5F02;&#x5E38;<br>&#x662F;&#x5426;&#x7EE7;&#x7EED;&#x67E5;&#x770B;&#x4E0B;&#x4E00;&#x5F20;&#xFF1F;', {
+      time: 30000, 
+      btn: ['&#x4E0B;&#x4E00;&#x5F20;', '&#x4E0D;&#x770B;&#x4E86;'], 
+      yes: function(){
+        data.length > 1 && dict.imgnext(true,true);
+      }
+    });
+  });
+};
+
 //主入口
 ready.run = function(){
  $ = jQuery; 
--- a/src/mobile/layer.js
+++ b/src/mobile/layer.js
@ -1,6 +1,6 @@
 /*!

- @Name：layer mobile v1.7 弹层组件移动版
+ @Name：layer mobile v1.8 弹层组件移动版
 @Author：贤心
 @Site：http://layer.layui.com/mobie/
 @License：LGPL
--- a/src/skin/layer.css
+++ b/src/skin/layer.css
@ -12,7 +12,7 @@ html #layui_layer_skinlayercss{display:none; position: absolute; width:1989px;}
 /* common */
 .layui-layer-shade, .layui-layer{position:fixed; _position:absolute; pointer-events: auto;}
 .layui-layer-shade{top:0; left:0; width:100%; height:100%; _height:expression(document.body.offsetHeight+"px");}
-.layui-layer{top:150px; left:50%; margin:0; padding:0; background-color:#fff; -webkit-background-clip: content; box-shadow: 1px 1px 50px rgba(0,0,0,.3);}
+.layui-layer{top:150px; left: 0; margin:0; padding:0; background-color:#fff; -webkit-background-clip: content; box-shadow: 1px 1px 50px rgba(0,0,0,.3);}
 .layui-layer-close{position:absolute;}
 .layui-layer-content{position:relative;}
 .layui-layer-border{border:1px solid #B2B2B2; border:1px solid rgba(0,0,0,.3); box-shadow: 1px 1px 5px rgba(0,0,0,.2);}
@ -52,7 +52,7 @@ html #layui_layer_skinlayercss{display:none; position: absolute; width:1989px;}
 		transform: scale(1)
 	}
 }
-.layui-anim{-webkit-animation-name: bounceIn;animation-name: bounceIn}
+.layer-anim{-webkit-animation-name: bounceIn;animation-name: bounceIn}
@-webkit-keyframes bounceOut {
    100% {
        opacity: 0;
@ -86,19 +86,19 @@ html #layui_layer_skinlayercss{display:none; position: absolute; width:1989px;}
 		transform: scale(1)
    }
 }
-.layui-anim-close{-webkit-animation-name: bounceOut;animation-name: bounceOut; -webkit-animation-duration:.2s; animation-duration:.2s;}
+.layer-anim-close{-webkit-animation-name: bounceOut;animation-name: bounceOut; -webkit-animation-duration:.2s; animation-duration:.2s;}

-@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-01{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}
+@-webkit-keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInDown{0%{opacity:0;-webkit-transform:scale(.1) translateY(-2000px);-ms-transform:scale(.1) translateY(-2000px);transform:scale(.1) translateY(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateY(60px);-ms-transform:scale(.475) translateY(60px);transform:scale(.475) translateY(60px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-01{-webkit-animation-name:zoomInDown;animation-name:zoomInDown}

-@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layui-anim-02{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}
+@-webkit-keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);transform:translateY(0)}}@keyframes fadeInUpBig{0%{opacity:0;-webkit-transform:translateY(2000px);-ms-transform:translateY(2000px);transform:translateY(2000px)}100%{opacity:1;-webkit-transform:translateY(0);-ms-transform:translateY(0);transform:translateY(0)}}.layer-anim-02{-webkit-animation-name:fadeInUpBig;animation-name:fadeInUpBig}

-@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layui-anim-03{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}
+@-webkit-keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}@keyframes zoomInLeft{0%{opacity:0;-webkit-transform:scale(.1) translateX(-2000px);-ms-transform:scale(.1) translateX(-2000px);transform:scale(.1) translateX(-2000px);-webkit-animation-timing-function:ease-in-out;animation-timing-function:ease-in-out}60%{opacity:1;-webkit-transform:scale(.475) translateX(48px);-ms-transform:scale(.475) translateX(48px);transform:scale(.475) translateX(48px);-webkit-animation-timing-function:ease-out;animation-timing-function:ease-out}}.layer-anim-03{-webkit-animation-name:zoomInLeft;animation-name:zoomInLeft}

-@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);-ms-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}.layui-anim-04{-webkit-animation-name:rollIn;animation-name:rollIn}
+@-webkit-keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}@keyframes rollIn{0%{opacity:0;-webkit-transform:translateX(-100%) rotate(-120deg);-ms-transform:translateX(-100%) rotate(-120deg);transform:translateX(-100%) rotate(-120deg)}100%{opacity:1;-webkit-transform:translateX(0px) rotate(0deg);-ms-transform:translateX(0px) rotate(0deg);transform:translateX(0px) rotate(0deg)}}.layer-anim-04{-webkit-animation-name:rollIn;animation-name:rollIn}

-@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layui-anim-05{-webkit-animation-name:fadeIn;animation-name:fadeIn}
+@keyframes fadeIn{0%{opacity:0}100%{opacity:1}}.layer-anim-05{-webkit-animation-name:fadeIn;animation-name:fadeIn}

-@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layui-anim-06{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}
+@-webkit-keyframes shake{0%,100%{-webkit-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);transform:translateX(10px)}}@keyframes shake{0%,100%{-webkit-transform:translateX(0);-ms-transform:translateX(0);transform:translateX(0)}10%,30%,50%,70%,90%{-webkit-transform:translateX(-10px);-ms-transform:translateX(-10px);transform:translateX(-10px)}20%,40%,60%,80%{-webkit-transform:translateX(10px);-ms-transform:translateX(10px);transform:translateX(10px)}}.layer-anim-06{-webkit-animation-name:shake;animation-name:shake}@-webkit-keyframes fadeIn{0%{opacity:0}100%{opacity:1}}

 /* 标题栏 */
 .layui-layer-title{padding:0 80px 0 20px; height:42px; line-height:42px; border-bottom:1px solid #eee; font-size:14px; color:#333; overflow: hidden; text-overflow: ellipsis; white-space: nowrap; background-color: #F8F8F8; border-radius: 2px 2px 0 0;}
@ -166,3 +166,47 @@ html #layui_layer_skinlayercss{display:none; position: absolute; width:1989px;}
 .layui-layer-molv .layui-layer-title{background:#009f95; color:#fff; border: none;}
 .layui-layer-molv .layui-layer-btn a{background:#009f95;}
 .layui-layer-molv .layui-layer-btn .layui-layer-btn1{background:#92B8B1;}
+
+
+
+/**
+ 
+ @Name: layer拓展样式
+ 
+ */
+
+.layui-layer-iconext{background:url(default/icon-ext.png) no-repeat;}
+
+/* prompt模式 */
+.layui-layer-prompt .layui-layer-input{display:block; width:220px; height:30px; margin:0 auto; line-height:30px; padding: 0 5px; border: 1px solid #ccc; box-shadow: 1px 1px 5px rgba(0,0,0,.1) inset; color:#333;}
+.layui-layer-prompt textarea.layui-layer-input{width:300px; height:100px; line-height:20px;}
+
+/* tab模式 */
+.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4);}
+.layui-layer-tab .layui-layer-title{padding-left:0; border-bottom:1px solid #ccc; background-color:#eee; overflow: visible;}
+.layui-layer-tab .layui-layer-title span{position:relative; float:left; min-width:80px; max-width:260px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
+.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px; border-left:1px solid #ccc; border-right:1px solid #ccc; background-color:#fff; z-index:10;}
+.layui-layer-tab .layui-layer-title span:first-child{border-left:none;}
+.layui-layer-tabmain{line-height:24px; clear:both;}
+.layui-layer-tabmain .layui-layer-tabli{display:none;}
+.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block;}
+.xubox_tabclose{position:absolute; right:10px; top:5px; cursor:pointer;}
+
+/* photo模式 */
+.layui-layer-photos{-webkit-animation-duration:1s; animation-duration:1s;}
+.layui-layer-photos .layui-layer-content{overflow:hidden; text-align: center;}
+.layui-layer-photos .layui-layer-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
+.layui-layer-imguide,.layui-layer-imgbar{display:none;}
+.layui-layer-imgprev, .layui-layer-imgnext{position:absolute; top:50%; width:27px; _width:44px; height:44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
+.layui-layer-imgprev{left:10px; background-position:-5px -5px; _background-position:-70px -5px;}
+.layui-layer-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
+.layui-layer-imgnext{right:10px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
+.layui-layer-imgnext:hover{background-position:-33px -50px; _background-position:-120px -50px;}
+.layui-layer-imgbar{position:absolute; left:0; bottom:0; width:100%; height:32px; line-height:32px; background-color:rgba(0,0,0,.8); background-color:#000\9; filter:Alpha(opacity=80); color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
+.layui-layer-imgtit{/*position:absolute; left:20px;*/}
+.layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
+.layui-layer-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
+.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;}
+.layui-layer-imgtit em{padding-left:10px; font-style: normal;}
+
+
--- a/src/skin/layer.ext.css
+++ b/src/skin/layer.ext.css
@ -1,44 +0,0 @@
-/*!
- 
- @Name: layer拓展样式
- @Date: 2012.12.13
- @Author: 贤心
- @blog: sentsin.com
- 
- */
-
-.layui-layer-iconext{background:url(default/icon-ext.png) no-repeat;}
-html #layui_layer_skinlayerextcss{display:none; position: absolute; width:1989px;}
-
-/* prompt模式 */
-.layui-layer-prompt .layui-layer-input{display:block; width:220px; height:30px; margin:0 auto; line-height:30px; padding: 0 5px; border: 1px solid #ccc; box-shadow: 1px 1px 5px rgba(0,0,0,.1) inset; color:#333;}
-.layui-layer-prompt textarea.layui-layer-input{width:300px; height:100px; line-height:20px;}
-
-/* tab模式 */
-.layui-layer-tab{box-shadow:1px 1px 50px rgba(0,0,0,.4);}
-.layui-layer-tab .layui-layer-title{padding-left:0; border-bottom:1px solid #ccc; background-color:#eee; overflow: visible;}
-.layui-layer-tab .layui-layer-title span{position:relative; float:left; min-width:80px; max-width:260px; padding:0 20px; text-align:center; cursor:default; text-overflow: ellipsis; overflow: hidden; white-space: nowrap;}
-.layui-layer-tab .layui-layer-title span.layui-layer-tabnow{height:43px; border-left:1px solid #ccc; border-right:1px solid #ccc; background-color:#fff; z-index:10;}
-.layui-layer-tab .layui-layer-title span:first-child{border-left:none;}
-.layui-layer-tabmain{line-height:24px; clear:both;}
-.layui-layer-tabmain .layui-layer-tabli{display:none;}
-.layui-layer-tabmain .layui-layer-tabli.xubox_tab_layer{display:block;}
-.xubox_tabclose{position:absolute; right:10px; top:5px; cursor:pointer;}
-
-/* photo模式 */
-.layui-layer-photos{-webkit-animation-duration:1s; animation-duration:1s;}
-.layui-layer-photos .layui-layer-content{overflow:hidden; text-align: center;}
-.layui-layer-photos .layui-layer-phimg img{position: relative; width:100%; display: inline-block; *display:inline; *zoom:1; vertical-align:top;}
-.layui-layer-imguide,.layui-layer-imgbar{display:none;}
-.layui-layer-imgprev, .layui-layer-imgnext{position:absolute; top:50%; width:27px; _width:44px; height:44px;  margin-top:-22px; outline:none;blr:expression(this.onFocus=this.blur());}
-.layui-layer-imgprev{left:10px; background-position:-5px -5px; _background-position:-70px -5px;}
-.layui-layer-imgprev:hover{background-position:-33px -5px; _background-position:-120px -5px;}
-.layui-layer-imgnext{right:10px; _right:8px; background-position:-5px -50px; _background-position:-70px -50px;}
-.layui-layer-imgnext:hover{background-position:-33px -50px; _background-position:-120px -50px;}
-.layui-layer-imgbar{position:absolute; left:0; bottom:0; width:100%; height:32px; line-height:32px; background-color:rgba(0,0,0,.8); background-color:#000\9; filter:Alpha(opacity=80); color:#fff; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; font-size:0;}
-.layui-layer-imgtit{/*position:absolute; left:20px;*/}
-.layui-layer-imgtit *{display:inline-block; *display:inline; *zoom:1; vertical-align:top; font-size:12px;}
-.layui-layer-imgtit a{max-width:65%;  text-overflow: ellipsis; overflow: hidden; white-space: nowrap; color:#fff;}
-.layui-layer-imgtit a:hover{color:#fff; text-decoration:underline;}
-.layui-layer-imgtit em{padding-left:10px; font-style: normal;}
-