Merge pull request #1105 from layui/2.x
优化 colorpicker 属性 lay-options 合并细节
This commit is contained in:
commit
cbe4a03ac3
2
dist/layui.js
vendored
2
dist/layui.js
vendored
File diff suppressed because one or more lines are too long
@ -177,7 +177,7 @@ layui.define(['jquery', 'lay'], function(exports){
|
||||
}
|
||||
|
||||
// 合并 lay-options 属性上的配置信息
|
||||
that.config = $.extend(options, lay.options(elem[0]));
|
||||
$.extend(options, lay.options(elem[0]));
|
||||
|
||||
//颜色选择框对象
|
||||
var elemColorBox = $(['<div class="layui-unselect layui-colorpicker">'
|
||||
|
Loading…
Reference in New Issue
Block a user