liz/wikijs-fork
liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code style and performance fixes

Browse Source
This commit is contained in:
NGPixel 2016-10-17 19:52:04 -04:00
parent 847c81946a
commit 9454065ab9
12 changed files with 57 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
client/js/components/editor-codeblock.js
View File

@ -8,6 +8,27 @@ codeEditor.setOption('wrap', true);
let modelist = ace.require("ace/ext/modelist");
// ACE - Mode Loader
let modelistLoaded = [];
let loadAceMode = (m) => {
return $.ajax({
url: '/js/ace/mode-' + m + '.js',
dataType: "script",
cache: true,
beforeSend: () => {
if(_.includes(modelistLoaded, m)) {
return false;
}
},
success: () => {
modelistLoaded.push(m);
}
});
};
// Vue Code Block instance
let vueCodeBlock = new Vue({
el: '#modal-editor-codeblock',
data: {
@ -39,23 +60,4 @@ let vueCodeBlock = new Vue({
}
}
});
// ACE - Mode Loader
let modelistLoaded = [];
let loadAceMode = (m) => {
return $.ajax({
url: '/js/ace/mode-' + m + '.js',
dataType: "script",
cache: true,
beforeSend: () => {
if(_.includes(modelistLoaded, m)) {
return false;
}
},
success: () => {
modelistLoaded.push(m);
}
});
}
});

8
client/js/components/editor-image.js
View File

@ -186,7 +186,7 @@ let vueImage = new Vue({
vueImage.isLoadingText = 'Moving image...';
vueImage.isLoading = true;
Vue.nextTick(() => {
socket.emit('uploadsMoveFile', { uid: uid, folder: fld }, (data) => {
socket.emit('uploadsMoveFile', { uid, folder: fld }, (data) => {
if(data.ok) {
vueImage.loadImages();
} else {
@ -311,7 +311,7 @@ let vueImage = new Vue({
position: (opt, x, y) => {
$(opt.$trigger).addClass('is-contextopen');
let trigPos = $(opt.$trigger).position();
let trigDim = { w: $(opt.$trigger).width() / 2, h: $(opt.$trigger).height() / 2 }
let trigDim = { w: $(opt.$trigger).width() / 2, h: $(opt.$trigger).height() / 2 };
opt.$menu.css({ top: trigPos.top + trigDim.h, left: trigPos.left + trigDim.w });
},
events: {
@ -370,7 +370,7 @@ $('#btn-editor-uploadimage input').on('change', (ev) => {
vueImage.isLoading = true;
},
progress: function(progress) {
progress: (progress) => {
vueImage.isLoadingText = 'Uploading...' + Math.round(progress) + '%';
},
@ -398,7 +398,7 @@ $('#btn-editor-uploadimage input').on('change', (ev) => {
}
},
error: function(error) {
error: (error) => {
alerts.pushError(error.message, this.upload.file.name);
},

38
client/js/components/editor.js
View File

@ -10,7 +10,7 @@ if($('#mk-editor').length === 1) {
Vue.filter('filesize', (v) => {
return _.toUpper(filesize(v));
})
});
//=include editor-image.js
//=include editor-codeblock.js
@ -170,26 +170,26 @@ if($('#mk-editor').length === 1) {
}
});
}
//-> Save
//-> Save
$('.btn-edit-save, .btn-create-save').on('click', (ev) => {
$('.btn-edit-save, .btn-create-save').on('click', (ev) => {
$.ajax(window.location.href, {
data: {
markdown: mde.value()
},
dataType: 'json',
method: 'PUT'
}).then((rData, rStatus, rXHR) => {
if(rData.ok) {
window.location.assign('/' + pageEntryPath);
} else {
alerts.pushError('Something went wrong', rData.error);
}
}, (rXHR, rStatus, err) => {
alerts.pushError('Something went wrong', 'Save operation failed.');
});
$.ajax(window.location.href, {
data: {
markdown: mde.value()
},
dataType: 'json',
method: 'PUT'
}).then((rData, rStatus, rXHR) => {
if(rData.ok) {
window.location.assign('/' + pageEntryPath);
} else {
alerts.pushError('Something went wrong', rData.error);
}
}, (rXHR, rStatus, err) => {
alerts.pushError('Something went wrong', 'Save operation failed.');
});
});
}

2
controllers/uploads.js
View File

@ -92,7 +92,7 @@ router.post('/img', lcdata.uploadImgHandler, (req, res, next) => {
return {
ok: false,
msg: r.reason().message
}
};
}
});
res.json({ ok: true, results: uplResults });

2
controllers/ws.js
View File

@ -21,7 +21,7 @@ module.exports = (socket) => {
cb = cb || _.noop;
upl.getUploadsFolders().then((f) => {
return cb(f) || true;
})
});
});
socket.on('uploadsCreateFolder', (data, cb) => {

2
libs/git.js
View File

@ -111,7 +111,7 @@ module.exports = {
self._git.exec('config', ['--local', 'user.email', self._signature.email])
).then(() => {
return self._git.exec('remote', ['add', 'origin', self._url]);
})
});
}
});

2
libs/internalAuth.js
View File

@ -19,7 +19,7 @@ module.exports = {
generateKey() {
return crypto.randomBytes(20).toString('hex')
return crypto.randomBytes(20).toString('hex');
},

2
libs/local.js
View File

@ -47,7 +47,7 @@ module.exports = {
this.uploadImgHandler = multer({
storage: multer.diskStorage({
destination: (req, f, cb) => {
cb(null, path.resolve(ROOTPATH, appconfig.paths.data, 'temp-upload'))
cb(null, path.resolve(ROOTPATH, appconfig.paths.data, 'temp-upload'));
}
}),
fileFilter: (req, f, cb) => {

2
libs/markdown.js
View File

@ -86,7 +86,7 @@ const parseTree = (content) => {
content = heading.children[1].content;
anchor = _.kebabCase(content);
} else {
content = heading.content
content = heading.content;
anchor = _.kebabCase(heading.children.reduce((acc, t) => acc + t.content, ""));
}

5
libs/uploads-agent.js
View File

@ -156,7 +156,7 @@ module.exports = {
return upl.watch();
})
});
},
@ -218,7 +218,7 @@ module.exports = {
filename: f,
basename: fPathObj.name,
filesize: s.size
}
};
// Generate thumbnail
@ -258,6 +258,7 @@ module.exports = {
* Generate thumbnail of image
*
* @param {String} sourcePath The source path
* @param {String} destPath The destination path
* @return {Promise<Object>} Promise returning the resized image info
*/
generateThumbnail(sourcePath, destPath) {

4
libs/uploads.js
View File

@ -95,7 +95,7 @@ module.exports = {
return db.UplFolder.findOne({ name: folderName }).then((f) => {
return (f) ? path.resolve(this._uploadsPath, folderName) : false;
})
});
},
@ -180,7 +180,7 @@ module.exports = {
let self = this;
let fUrlObj = url.parse(fUrl);
let fUrlFilename = _.last(_.split(fUrlObj.pathname, '/'))
let fUrlFilename = _.last(_.split(fUrlObj.pathname, '/'));
let destFolder = _.chain(fFolder).trim().toLower().value();
return upl.validateUploadsFolder(destFolder).then((destFolderPath) => {

2
libs/winston.js
View File

@ -4,7 +4,7 @@ var winston = require('winston');
module.exports = (isDebug) => {
winston.remove(winston.transports.Console)
winston.remove(winston.transports.Console);
winston.add(winston.transports.Console, {
level: (isDebug) ? 'info' : 'warn',
prettyPrint: true,