From eceeaaea7b2c953f20e32671579a86b10c9151eb Mon Sep 17 00:00:00 2001 From: osdu <858908467@qq.com> Date: Tue, 8 Nov 2016 13:12:08 +0800 Subject: [PATCH 1/2] remove package.json utf8-bom --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index a70a984..a8c56cd 100644 --- a/package.json +++ b/package.json @@ -1,4 +1,4 @@ -{ +{ "name": "layer", "version": "3.0.0", "mobile": "2.0.0", From 493cc4a639980bd4d07a69d6b4da9d8717bc17e3 Mon Sep 17 00:00:00 2001 From: osdu <858908467@qq.com> Date: Tue, 8 Nov 2016 13:14:42 +0800 Subject: [PATCH 2/2] add .layui-layer-prompt > .layui-layer-note --- src/layer.js | 4 +++- src/skin/default/layer.css | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/layer.js b/src/layer.js index 63c33d5..0cf055d 100644 --- a/src/layer.js +++ b/src/layer.js @@ -931,7 +931,9 @@ layer.prompt = function(options, yes){ style = 'style="width: '+ area[0] +'; height: '+ area[1] + ';"'; delete options.area; } - var prompt, content = options.formType == 2 ? '' : function(){ + + var prompt, content = options.note ? '