增加empty.woff
This commit is contained in:
BIN
font/empty.woff
Normal file
BIN
font/empty.woff
Normal file
Binary file not shown.
@@ -14,6 +14,11 @@ define(
|
|||||||
name: 'iconfont.ttf',
|
name: 'iconfont.ttf',
|
||||||
url: './font/iconfont.ttf',
|
url: './font/iconfont.ttf',
|
||||||
from: '阿里妈妈图标库'
|
from: '阿里妈妈图标库'
|
||||||
|
},
|
||||||
|
{
|
||||||
|
name: 'empty.woff',
|
||||||
|
url: './font/empty.woff',
|
||||||
|
from: 'fonteditor'
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ define(
|
|||||||
if (program.ttfManager.isChanged() && !window.confirm('是否放弃保存当前项目?')) {
|
if (program.ttfManager.isChanged() && !window.confirm('是否放弃保存当前项目?')) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
$.getJSON('./src/fonteditor/data/empty.json', function(imported) {
|
$.getJSON('./font/empty.json', function(imported) {
|
||||||
program.ttfManager.set(imported);
|
program.ttfManager.set(imported);
|
||||||
program.data.projectName = null;
|
program.data.projectName = null;
|
||||||
});
|
});
|
||||||
@@ -93,7 +93,7 @@ define(
|
|||||||
url: url,
|
url: url,
|
||||||
onSuccess: function(buffer) {
|
onSuccess: function(buffer) {
|
||||||
program.loader.load(buffer, {
|
program.loader.load(buffer, {
|
||||||
type: 'ttf',
|
type: url.slice(url.lastIndexOf('.') + 1) || 'ttf',
|
||||||
success: function(imported) {
|
success: function(imported) {
|
||||||
program.loading.hide();
|
program.loading.hide();
|
||||||
if (program.ttfManager.get()) {
|
if (program.ttfManager.get()) {
|
||||||
|
|||||||
Reference in New Issue
Block a user