fix woff deflate

This commit is contained in:
kekee000 2014-11-24 17:13:00 +08:00
parent c6e5acf1de
commit 02770032bf
5 changed files with 19 additions and 17 deletions

2
dep/pako_deflate.min.js vendored Normal file

File diff suppressed because one or more lines are too long

2
dep/pako_inflate.min.js vendored Normal file

File diff suppressed because one or more lines are too long

View File

@ -114,7 +114,9 @@
baseUrl: './src',
paths: {
utpl: '../dep/utpl.min',
JSZip: '../dep/jszip/jszip'
JSZip: '../dep/jszip/jszip.min',
inflate: '../dep/pako_inflate.min',
deflate: '../dep/pako_deflate.min'
}
});
define('jquery', $);

View File

@ -15,6 +15,7 @@ define(
var ttf2eot = require('ttf/ttf2eot');
var ttf2svg = require('ttf/ttf2svg');
var bytes2base64 = require('ttf/util/bytes2base64');
var deflate = require('deflate');
var JSZip = require('JSZip');
/**
@ -31,11 +32,7 @@ define(
function font2buffer(ttf, options) {
var buffer = null;
if (options.type === 'woff') {
buffer = ttf2woff(new TTFWriter().write(ttf), {
deflate: function(input) {
return JSZip.compressions.DEFLATE.compress(input);
}
});
buffer = ttf2woff(new TTFWriter().write(ttf), deflate);
}
else if (options.type === 'eot') {
buffer = ttf2eot(new TTFWriter().write(ttf));

View File

@ -14,13 +14,12 @@ define(
var woff2ttf = require('ttf/woff2ttf');
var eot2ttf = require('ttf/eot2ttf');
var svg2ttfobject = require('ttf/svg2ttfobject');
var inflate = require('inflate');
var JSZip = require('JSZip');
var loading = require('./loading');
var woffOptions = {
inflate: function(input) {
return JSZip.compressions.DEFLATE.uncompress(input);
}
inflate: inflate.inflate
};