fis-spriter-csssprites
Advanced tools
Comparing version 0.1.5 to 0.1.6
@@ -38,8 +38,2 @@ /** | ||
module.exports.defaultOptions = { | ||
//最优排列(装箱),混合排序 | ||
'optimalPacking': false | ||
}; | ||
function _process(file, ret, settings, opt) { | ||
@@ -46,0 +40,0 @@ var images = {}; |
@@ -128,9 +128,7 @@ /* | ||
}, | ||
setType: function(type) { | ||
this._type = type; | ||
}, | ||
getType: function() { | ||
if (this._settings && this._settings['optimalPacking']) { | ||
//如果使用混排 | ||
return this._type; | ||
} else { | ||
return 'left'; | ||
} | ||
return this._type; | ||
}, | ||
@@ -137,0 +135,0 @@ getDirect: function() { |
@@ -15,8 +15,11 @@ /* | ||
function Generator(file, list, images, ret, settings, opt) { | ||
var default_settings = { | ||
'margin': 3, | ||
'width_limit': 10240, | ||
'height_limit': 10240 | ||
'height_limit': 10240, | ||
'layout': 'linear' | ||
} | ||
fis.util.map(default_settings, function (key, value) { | ||
@@ -32,2 +35,8 @@ if (settings.hasOwnProperty(key)) { | ||
//如果layout不支持的类型,默认为linear | ||
var layouts = ['matrix', 'linear']; | ||
if (layouts.indexOf(settings.layout) == -1) { | ||
settings.layout = 'linear'; | ||
} | ||
//设置宽高限制 | ||
@@ -180,2 +189,7 @@ Image.setLimit(settings.width_limit, settings.height_limit); | ||
var item = list[i]; | ||
// 如果默认是linear,type全都设为left | ||
if (this.settings.layout == 'linear') { | ||
item.setType('left'); | ||
} | ||
if (item.getType() == 'left') { | ||
@@ -182,0 +196,0 @@ k0 = 0; |
{ | ||
"name": "fis-spriter-csssprites", | ||
"version": "0.1.5", | ||
"version": "0.1.6", | ||
"description": "基于fis的csssprite,支持repeat-x,repeat-x,background-position", | ||
@@ -5,0 +5,0 @@ "main": "index.js", |
@@ -13,3 +13,3 @@ ##fis-spriter-csssprites | ||
####环境要求 | ||
0. 依赖native插件,[node-images](https://github.com/xiangshouding/node-images) 环境需要符合个插件的要求。(OS X、Windows提供了二进制包) | ||
0. 依赖native插件,[node-images](https://github.com/xiangshouding/node-images) 环境需要符合个插件的要求。(OS X、Windows、Linux x86 提供了二进制包) | ||
0. 只能在FIS中使用 | ||
@@ -42,3 +42,5 @@ | ||
//图之间的边距 | ||
margin: 10 | ||
margin: 10, | ||
//使用矩阵排列方式,默认为线性`linear` | ||
layout: 'matrix' | ||
} | ||
@@ -45,0 +47,0 @@ } |
26088
592
173