wanjia9506
/
amWiki
0
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

修复新版本不能导出的 bug

This commit is contained in:
TevinLi 2017-03-21 16:58:28 +08:00
parent 6ec3b8b98d
commit 6ea0ce27c8
3 changed files with 24 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
build/manageFolder.js
View File

@ -102,6 +102,7 @@ module.exports = {
if (!path && typeof path !== 'string') {
return false;
}
path = path.replace(/\\/g, '/');
path = path.indexOf('library') < 0 ? path : path.split('library')[0];
path = path.indexOf('config.json') < 0 ? path : path.split('config.json')[0];
path = path.indexOf('index.html') < 0 ? path : path.split('index.html')[0];

8
build/manageWiki.js
View File

@ -52,10 +52,10 @@ module.exports = {
if (path.indexOf('library') > 0) {
this.addWiki(path.split('library')[0]);
} else {
const wId = this.createWikiId(path);
//不包含library路径时，需要判断是否为amWiki项目
if (typeof this._wikis[wId] === 'undefined' && mngFolder.isAmWiki(path)) {
this.addWiki(path, wId);
//验证转换 path 为 wiki 根目录
const root = mngFolder.isAmWiki(path);
if (root) {
this.addWiki(root);
}
}
},

31
lib/main.js
View File

@ -92,12 +92,16 @@ module.exports = {
//命令：手动更新当前文库导航
'amWiki:makeNav': () => {
const [isOnEdit, editor, editPath] = this._getEditorPath();
if (isOnEdit || (typeof editPath !== 'undefined' && mngFolder.isAmWiki(editPath))) {
makeNav.refresh(editPath);
mngWiki.checkAddWiki(editPath);
} else {
alert('只有当你打开一个 amWiki 文库时，才能手动更新导航文件！');
if (typeof editPath !== 'undefined') {
//当 isOnEdit 为 false 时，editPath 仍然不一定为根目录
const root = mngFolder.isAmWiki(editPath);
if (root) {
makeNav.refresh(root + 'library/');
mngWiki.checkAddWiki(root);
return;
}
}
alert('只有当你打开一个 amWiki 文库时，才能手动更新导航文件！');
},
//命令：粘帖截图
'amWiki:paste': () => {
@ -126,12 +130,15 @@ module.exports = {
//命令：导出项目为 github wiki
'amWiki:export.gitHub': () => {
const [isOnEdit, editor, editPath] = this._getEditorPath();
if (isOnEdit || (typeof editPath !== 'undefined' && mngFolder.isAmWiki(editPath))) {
exportGithub.export(editPath);
mngWiki.checkAddWiki(editPath);
} else {
alert('导出失败！\n只能对一个 amWiki 项目进行导出！');
if (typeof editPath !== 'undefined') {
const root = mngFolder.isAmWiki(editPath);
if (root) {
exportGithub.export(root);
mngWiki.checkAddWiki(root);
return;
}
}
alert('导出失败！\n只能对一个 amWiki 项目进行导出！');
},
//命令：显示about
'amWiki:about': () => {
@ -181,8 +188,8 @@ module.exports = {
if (!grammar) {
return [false, editor];
}
const ePath = editor.getPath();
if (editor.getPath().substr(-3) !== '.md') {
const ePath = editor.getPath().replace(/\\/g, '/');
if (ePath.substr(-3) !== '.md') {
return [false, editor, ePath];
}
if (ePath.indexOf('library') < 0) {