github/fonteditor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add auto sync

Browse Source
This commit is contained in:
kekee000
2015-04-13 00:03:58 +08:00
parent a110fb8e27
commit 3f0a08d40d
5 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
src/fonteditor/controller/actions.js
View File

@@ -127,18 +127,24 @@ define(
}
},
'sync': function (projectId, ttf, syncConfig) {
syncConfig = syncConfig || program.project.getConfig(projectId).sync;
if (syncConfig) {
fontDelaySync(program.data.projectId, ttf, syncConfig);
}
},
'save': function () {
if (program.ttfManager.get()) {
if (program.data.projectId) {
program.project.update(program.data.projectId, program.ttfManager.get())
var projectId = program.data.projectId;
if (projectId) {
program.project.update(projectId, program.ttfManager.get())
.then(function () {
program.ttfManager.setState('saved');
program.loading.show('保存成功...', 400);
var syncConfig = program.project.getConfig(program.data.projectId).sync;
if (syncConfig && !syncConfig.pause) {
fontDelaySync(program.data.projectId, program.ttfManager.get(), syncConfig);
var syncConfig = program.project.getConfig(projectId).sync;
if (syncConfig && syncConfig.autoSync) {
actions.sync(projectId, program.ttfManager.get(), syncConfig);
}
}, function () {
program.loading.show('保存失败...', 1000);
@@ -150,7 +156,6 @@ define(
if ((name = window.prompt('请输入项目名称：', name))) {
name = string.encodeHTML(name);
program.project.add(name, program.ttfManager.get())
.then(function (id) {
program.data.projectId = id;

4
src/fonteditor/controller/default.js
View File

@@ -363,6 +363,7 @@ define(
program.project.updateConfig(program.data.projectId, {
sync: setting
});
program.projectViewer.show(program.project.items(), program.data.projectId);
}
}).show(syncConfig);
}
@@ -447,6 +448,9 @@ define(
actions.save();
program.viewer.focus();
})
.on('sync', function (e) {
actions.sync(e.projectId);
})
.on('del', function (e) {
program.project.remove(e.projectId).then(function () {
if (e.projectId === program.data.projectId) {

6
src/fonteditor/template/dialog/setting-sync.tpl
View File

@@ -18,9 +18,9 @@
</div>
<div class="form-group">
<div class="input-group input-group-sm">
<span class="input-group-addon">暂停同步</span>
<span class="input-group-addon">自动同步</span>
<span class="form-control">
<input data-field="pause" type="checkbox">
<input data-field="autoSync" type="checkbox" checked="checked">
</span>
</div>
</div>
@@ -41,7 +41,7 @@
<div class="input-group input-group-sm">
<span class="input-group-addon">ttf</span>
<span class="form-control">
<input data-field="ttf" type="checkbox">
<input data-field="ttf" type="checkbox" checked="checked">
</span>
</div>
</div>

2
src/fonteditor/template/dialog/setting-sync.tpl.js
View File

@@ -1 +1 @@
define(function () {return '\n<div class="form-group">\n <button id="setting-sync-cancel" type="button" class="btn btn-flat btn-sm btn-right">取消同步</button>\n <div class="input-group input-group-sm">\n <span class="input-group-addon">远程地址</span>\n <input data-field="url" type="text" class="form-control">\n </div>\n</div>\n\n\n<div class="form-inline column-2">\n\n <div class="form-group">\n <div class="input-group input-group-sm">\n <span class="input-group-addon">字体名称</span>\n <input data-field="name" type="text" class="form-control">\n </div>\n </div>\n <div class="form-group">\n <div class="input-group input-group-sm">\n <span class="input-group-addon">暂停同步</span>\n <span class="form-control">\n <input data-field="pause" type="checkbox">\n </span>\n </div>\n </div>\n</div>\n<div class="form-inline">\n <span>字体类型： </span>\n\n <div class="form-group">\n <div class="input-group input-group-sm">\n <span class="input-group-addon">woff</span>\n <span class="form-control">\n <input data-field="woff" type="checkbox" checked="checked">\n </span>\n </div>\n </div>\n\n <div class="form-group">\n <div class="input-group input-group-sm">\n <span class="input-group-addon">ttf</span>\n <span class="form-control">\n <input data-field="ttf" type="checkbox">\n </span>\n </div>\n </div>\n\n <div class="form-group">\n <div class="input-group input-group-sm">\n <span class="input-group-addon">svg</span>\n <span class="form-control">\n <input data-field="svg" type="checkbox">\n </span>\n </div>\n </div>\n\n <div class="form-group">\n <div class="input-group input-group-sm">\n <span class="input-group-addon">eot</span>\n <span class="form-control">\n <input data-field="eot" type="checkbox">\n </span>\n </div>\n </div>\n</div>\n';});
define(function () {return '\r\n<div class="form-group">\r\n <button id="setting-sync-cancel" type="button" class="btn btn-flat btn-sm btn-right">取消同步</button>\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">远程地址</span>\r\n <input data-field="url" type="text" class="form-control">\r\n </div>\r\n</div>\r\n\r\n\r\n<div class="form-inline column-2">\r\n\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">字体名称</span>\r\n <input data-field="name" type="text" class="form-control">\r\n </div>\r\n </div>\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">自动同步</span>\r\n <span class="form-control">\r\n <input data-field="autoSync" type="checkbox" checked="checked">\r\n </span>\r\n </div>\r\n </div>\r\n</div>\r\n<div class="form-inline">\r\n <span>字体类型： </span>\r\n\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">woff</span>\r\n <span class="form-control">\r\n <input data-field="woff" type="checkbox" checked="checked">\r\n </span>\r\n </div>\r\n </div>\r\n\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">ttf</span>\r\n <span class="form-control">\r\n <input data-field="ttf" type="checkbox" checked="checked">\r\n </span>\r\n </div>\r\n </div>\r\n\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">svg</span>\r\n <span class="form-control">\r\n <input data-field="svg" type="checkbox">\r\n </span>\r\n </div>\r\n </div>\r\n\r\n <div class="form-group">\r\n <div class="input-group input-group-sm">\r\n <span class="input-group-addon">eot</span>\r\n <span class="form-control">\r\n <input data-field="eot" type="checkbox">\r\n </span>\r\n </div>\r\n </div>\r\n</div>\r\n';});

1
src/fonteditor/widget/projectviewer.js
View File

@@ -70,6 +70,7 @@ define(
str += '<dl data-id="' + proj.id + '">'
+ '<dt>' + proj.name + '</dt>'
+ '<dd>'
+ (proj.config && proj.config.sync ? '<span data-action="sync" title="同步当前字体">同步</span>' : '')
+ '<span data-action="saveas">另存为</span>'
+ '<span data-action="del">删除</span>'
+ '</dd>'