From 9454065ab95b736c9aeef7d67652e69db992a5ce Mon Sep 17 00:00:00 2001 From: NGPixel Date: Mon, 17 Oct 2016 19:52:04 -0400 Subject: [PATCH] Code style and performance fixes --- client/js/components/editor-codeblock.js | 42 +++++++++++++----------- client/js/components/editor-image.js | 8 ++--- client/js/components/editor.js | 38 ++++++++++----------- controllers/uploads.js | 2 +- controllers/ws.js | 2 +- libs/git.js | 2 +- libs/internalAuth.js | 2 +- libs/local.js | 2 +- libs/markdown.js | 2 +- libs/uploads-agent.js | 5 +-- libs/uploads.js | 4 +-- libs/winston.js | 2 +- 12 files changed, 57 insertions(+), 54 deletions(-) diff --git a/client/js/components/editor-codeblock.js b/client/js/components/editor-codeblock.js index 09fafb9a..a83240c9 100644 --- a/client/js/components/editor-codeblock.js +++ b/client/js/components/editor-codeblock.js @@ -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); - } - }); -} \ No newline at end of file +}); \ No newline at end of file diff --git a/client/js/components/editor-image.js b/client/js/components/editor-image.js index 74993f52..18737858 100644 --- a/client/js/components/editor-image.js +++ b/client/js/components/editor-image.js @@ -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); }, diff --git a/client/js/components/editor.js b/client/js/components/editor.js index d5265f88..1419dba4 100644 --- a/client/js/components/editor.js +++ b/client/js/components/editor.js @@ -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.'); }); -}); \ No newline at end of file +} \ No newline at end of file diff --git a/controllers/uploads.js b/controllers/uploads.js index 300bf4cb..a7747f92 100644 --- a/controllers/uploads.js +++ b/controllers/uploads.js @@ -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 }); diff --git a/controllers/ws.js b/controllers/ws.js index f64a68bb..5349d9be 100644 --- a/controllers/ws.js +++ b/controllers/ws.js @@ -21,7 +21,7 @@ module.exports = (socket) => { cb = cb || _.noop; upl.getUploadsFolders().then((f) => { return cb(f) || true; - }) + }); }); socket.on('uploadsCreateFolder', (data, cb) => { diff --git a/libs/git.js b/libs/git.js index b6ac9ee1..08cbfe29 100644 --- a/libs/git.js +++ b/libs/git.js @@ -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]); - }) + }); } }); diff --git a/libs/internalAuth.js b/libs/internalAuth.js index 50ef7bde..852d7356 100644 --- a/libs/internalAuth.js +++ b/libs/internalAuth.js @@ -19,7 +19,7 @@ module.exports = { generateKey() { - return crypto.randomBytes(20).toString('hex') + return crypto.randomBytes(20).toString('hex'); }, diff --git a/libs/local.js b/libs/local.js index d74854ec..cb23890a 100644 --- a/libs/local.js +++ b/libs/local.js @@ -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) => { diff --git a/libs/markdown.js b/libs/markdown.js index ea40ce8b..c605ea70 100644 --- a/libs/markdown.js +++ b/libs/markdown.js @@ -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, "")); } diff --git a/libs/uploads-agent.js b/libs/uploads-agent.js index 343b9570..53cf9109 100644 --- a/libs/uploads-agent.js +++ b/libs/uploads-agent.js @@ -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} Promise returning the resized image info */ generateThumbnail(sourcePath, destPath) { diff --git a/libs/uploads.js b/libs/uploads.js index 6b6686ba..fe45a7e2 100644 --- a/libs/uploads.js +++ b/libs/uploads.js @@ -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) => { diff --git a/libs/winston.js b/libs/winston.js index e630e380..8a78442e 100644 --- a/libs/winston.js +++ b/libs/winston.js @@ -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,