Skip to content

Commit bdc560b

Browse files
author
sentsin
committed
update
1 parent 7a149d4 commit bdc560b

File tree

14 files changed

+1146
-1129
lines changed

14 files changed

+1146
-1129
lines changed

CHANGELOG.md

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
【2.1】2015.11.04
1+
【2.2】2015.03.18
2+
> 增加参数id,用于控制弹层唯一标识。如不想重复弹出,可设置该值。
3+
> layer.tips允许出现遮罩,即不对shade参数做限制。
4+
> 对layer.photos方法直接弹出页面图片进行了事件委托,修复了之前由于动态插入的img而无法执行
5+
6+
弹出的bug,并且修复了当图片信息改变时,仍然弹出了之前的图片的bug
7+
> layer.photos方法多处代码进行了优化
8+
> 对layer.tab方法新增回调函数change,用于监听选项卡的切换事件,返回一个选项卡索引参数。
9+
> 样式微调
10+
11+
12+
【2.1】2015.11.04
213
* 修复在使用seajs或者requirejs后,layer.ext.js报layer未定义的错误。
314
* 修复弹出层后,回车键无效的bug。
415
* 修复iframe层的success回调在ie8以下浏览器无效的bug

GruntFile.js

Lines changed: 55 additions & 55 deletions
Original file line numberDiff line numberDiff line change
@@ -1,63 +1,63 @@
11
module.exports = function(grunt) {
22

3-
// Project configuration.
4-
grunt.initConfig({
5-
pkg: grunt.file.readJSON('package.json'),
6-
7-
//压缩js - layer
8-
uglify: {
9-
options: {
10-
expand: true
11-
},
12-
'layer.js': {
13-
options: {
14-
banner: '/*! layer-v<%= pkg.version %> <%= pkg.description %> License LGPL <%= pkg.homepage %> By <%= pkg.author %> */\n;'
15-
},
16-
src: './src/layer.js',
17-
dest: './layer.js'
18-
},
19-
'layer.ext.js': {
20-
options: {
21-
banner: '/*! layer<%= pkg.description %>拓展类 */\n;'
22-
},
23-
src: './src/extend/layer.ext.js',
24-
dest: './extend/layer.ext.js'
25-
},
26-
'layer.mobile.js': {
27-
options: {
28-
banner: '/*! layer mobile-v<%= pkg.mobile %> <%= pkg.description %>移动版 License LGPL <%= pkg.homepage %>mobile By <%= pkg.author %> */\n;'
29-
},
30-
src: './src/mobile/layer.js',
31-
dest: './mobile/layer.js'
32-
}
3+
// Project configuration.
4+
grunt.initConfig({
5+
pkg: grunt.file.readJSON('package.json'),
6+
7+
//压缩js - layer
8+
uglify: {
9+
options: {
10+
expand: true
11+
},
12+
'layer.js': {
13+
options: {
14+
banner: '/*! layer-v<%= pkg.version %> <%= pkg.description %> License LGPL <%= pkg.homepage %> By <%= pkg.author %> */\n;'
15+
},
16+
src: './src/layer.js',
17+
dest: './layer.js'
18+
},
19+
'layer.ext.js': {
20+
options: {
21+
banner: '/*! layer<%= pkg.description %>拓展类 */\n;'
22+
},
23+
src: './src/extend/layer.ext.js',
24+
dest: './extend/layer.ext.js'
25+
},
26+
'layer.mobile.js': {
27+
options: {
28+
banner: '/*! layer mobile-v<%= pkg.mobile %> <%= pkg.description %>移动版 License LGPL <%= pkg.homepage %>mobile By <%= pkg.author %> */\n;'
3329
},
30+
src: './src/mobile/layer.js',
31+
dest: './mobile/layer.js'
32+
}
33+
},
3434

35-
//压缩css
36-
cssmin: {
37-
options : {
38-
compatibility : 'ie8', //设置兼容模式
39-
noAdvanced : true //取消高级特性
40-
}
41-
,layer: {
42-
files: [{
43-
expand: true,
44-
cwd: './src/skin',
45-
src: ['*.css', '!*.min.css'],
46-
dest: './skin'
47-
}, {
48-
expand: true,
49-
cwd: './src/mobile/need',
50-
src: ['*.css', '!*.min.css'],
51-
dest: './mobile/need'
52-
}]
53-
}
54-
}
55-
});
35+
//压缩css
36+
cssmin: {
37+
options : {
38+
compatibility : 'ie8', //设置兼容模式
39+
noAdvanced : true //取消高级特性
40+
}
41+
,layer: {
42+
files: [{
43+
expand: true,
44+
cwd: './src/skin',
45+
src: ['*.css', '!*.min.css'],
46+
dest: './skin'
47+
}, {
48+
expand: true,
49+
cwd: './src/mobile/need',
50+
src: ['*.css', '!*.min.css'],
51+
dest: './mobile/need'
52+
}]
53+
}
54+
}
55+
});
5656

57-
grunt.loadNpmTasks('grunt-contrib-uglify');
58-
grunt.loadNpmTasks('grunt-contrib-cssmin');
59-
60-
grunt.registerTask('default', ['uglify', 'cssmin']);
57+
grunt.loadNpmTasks('grunt-contrib-uglify');
58+
grunt.loadNpmTasks('grunt-contrib-cssmin');
59+
60+
grunt.registerTask('default', ['uglify', 'cssmin']);
6161

6262

6363
};

bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "layer",
33
"main": "src/layer.js",
4-
"version": "2.1.0",
4+
"version": "2.2.0",
55
"homepage": "https://github.com/sentsin/layer",
66
"authors": [
77
"sentsin <xu@sentsin.com>"

extend/layer.ext.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)