调整一些小冲突

This commit is contained in:
sentsin
2016-10-20 16:07:29 +08:00
parent 5038eebdf1
commit 3e2ad5e063
6 changed files with 337 additions and 17 deletions

View File

@@ -39,7 +39,7 @@ layui.define('jquery', function(exports){
var othis = $(this)
,index = index || othis.index()
,parents = othis.parents('.layui-tab')
,item = parents.find('.layui-tab-content .layui-tab-item')
,item = parents.children('.layui-tab-content').children('.layui-tab-item')
,filter = parents.attr('lay-filter');
othis.addClass(THIS).siblings().removeClass(THIS);
@@ -57,8 +57,8 @@ layui.define('jquery', function(exports){
$('.layui-tab').each(function(){
var othis = $(this)
,title = othis.find('.layui-tab-title')
,item = othis.find('.layui-tab-item')
,title = othis.children('.layui-tab-title')
,item = othis.children('.layui-tab-content').children('.layui-tab-item')
,STOPE = 'lay-stope="tabmore"'
,span = $('<span class="layui-unselect layui-tab-bar" '+ STOPE +'><i '+ STOPE +' class="layui-icon">&#xe61a;</i></span>');
@@ -73,7 +73,7 @@ layui.define('jquery', function(exports){
close.on('click', function(){
var li = $(this).parent(), index = li.index();
var parents = li.parents('.layui-tab');
var item = parents.find('.layui-tab-content .layui-tab-item');
var item = parents.children('.layui-tab-content').children('.layui-tab-item')
if(li.hasClass(THIS)){
if(li.next()[0]){