Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history
  • Loading branch information
sentsin committed Mar 17, 2016
1 parent 7a149d4 commit bdc560b
Show file tree
Hide file tree
Showing 14 changed files with 1,146 additions and 1,129 deletions.
13 changes: 12 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,15 @@
【2.1】2015.11.04
【2.2】2015.03.18
> 增加参数id,用于控制弹层唯一标识。如不想重复弹出,可设置该值。
> layer.tips允许出现遮罩,即不对shade参数做限制。
> 对layer.photos方法直接弹出页面图片进行了事件委托,修复了之前由于动态插入的img而无法执行
弹出的bug,并且修复了当图片信息改变时,仍然弹出了之前的图片的bug
> layer.photos方法多处代码进行了优化
> 对layer.tab方法新增回调函数change,用于监听选项卡的切换事件,返回一个选项卡索引参数。
> 样式微调

【2.1】2015.11.04
* 修复在使用seajs或者requirejs后,layer.ext.js报layer未定义的错误。
* 修复弹出层后,回车键无效的bug。
* 修复iframe层的success回调在ie8以下浏览器无效的bug
Expand Down
110 changes: 55 additions & 55 deletions GruntFile.js
Original file line number Diff line number Diff line change
@@ -1,63 +1,63 @@
module.exports = function(grunt) {

// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

//压缩js - layer
uglify: {
options: {
expand: true
},
'layer.js': {
options: {
banner: '/*! layer-v<%= pkg.version %> <%= pkg.description %> License LGPL <%= pkg.homepage %> By <%= pkg.author %> */\n;'
},
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;'
},
src: './src/mobile/layer.js',
dest: './mobile/layer.js'
}
// Project configuration.
grunt.initConfig({
pkg: grunt.file.readJSON('package.json'),

//压缩js - layer
uglify: {
options: {
expand: true
},
'layer.js': {
options: {
banner: '/*! layer-v<%= pkg.version %> <%= pkg.description %> License LGPL <%= pkg.homepage %> By <%= pkg.author %> */\n;'
},
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;'
},
src: './src/mobile/layer.js',
dest: './mobile/layer.js'
}
},

//压缩css
cssmin: {
options : {
compatibility : 'ie8', //设置兼容模式
noAdvanced : true //取消高级特性
}
,layer: {
files: [{
expand: true,
cwd: './src/skin',
src: ['*.css', '!*.min.css'],
dest: './skin'
}, {
expand: true,
cwd: './src/mobile/need',
src: ['*.css', '!*.min.css'],
dest: './mobile/need'
}]
}
}
});
//压缩css
cssmin: {
options : {
compatibility : 'ie8', //设置兼容模式
noAdvanced : true //取消高级特性
}
,layer: {
files: [{
expand: true,
cwd: './src/skin',
src: ['*.css', '!*.min.css'],
dest: './skin'
}, {
expand: true,
cwd: './src/mobile/need',
src: ['*.css', '!*.min.css'],
dest: './mobile/need'
}]
}
}
});

grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-cssmin');
grunt.registerTask('default', ['uglify', 'cssmin']);
grunt.loadNpmTasks('grunt-contrib-uglify');
grunt.loadNpmTasks('grunt-contrib-cssmin');

grunt.registerTask('default', ['uglify', 'cssmin']);


};
2 changes: 1 addition & 1 deletion bower.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"name": "layer",
"main": "src/layer.js",
"version": "2.1.0",
"version": "2.2.0",
"homepage": "https://github.com/sentsin/layer",
"authors": [
"sentsin <[email protected]>"
Expand Down
2 changes: 1 addition & 1 deletion extend/layer.ext.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit bdc560b

Please sign in to comment.