From ecf81aba987eb703658e87d727ebd75a6bbfcf96 Mon Sep 17 00:00:00 2001 From: gregorybesson Date: Wed, 26 Oct 2016 14:19:58 +0200 Subject: [PATCH 1/3] fix:lint --- package.json | 2 +- src/cli/extend/lock.js | 6 +----- src/cli/process/generate-posts.js | 3 --- src/cli/process/initAbeForProcesses.js | 6 +++--- 4 files changed, 5 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index b9b29d86..0bbc9167 100644 --- a/package.json +++ b/package.json @@ -66,7 +66,7 @@ "https": "^1.0.0", "limax": "^1.4.0", "mkdirp": "^0.5.1", - "moment": "^2.11.1", + "moment": "^2.15.2", "nanoajax": "^0.4.0", "node-sqlparser": "^1.0.2", "on": "^1.3.0", diff --git a/src/cli/extend/lock.js b/src/cli/extend/lock.js index 1419276b..1d4ff7a5 100644 --- a/src/cli/extend/lock.js +++ b/src/cli/extend/lock.js @@ -1,11 +1,7 @@ -import process from 'child_process' import path from 'path' import fs from 'fs' -import { - config - ,abeExtend -} from '../' +import {config} from '../' export function create(name) { let lockFile = path.join(config.root, `abe-process-${name}.lock`) diff --git a/src/cli/process/generate-posts.js b/src/cli/process/generate-posts.js index 871ac58d..18579d17 100644 --- a/src/cli/process/generate-posts.js +++ b/src/cli/process/generate-posts.js @@ -9,10 +9,7 @@ var abeExtend = require('../../cli').abeExtend var Manager = require('../../cli').Manager var cmsData = require('../../cli').cmsData var cmsTemplates = require('../../cli').cmsTemplates - var config = require('../../cli').config - -var dateStart var templatesTexts = {} function publishNext(files, tt, cb, i = 0) { diff --git a/src/cli/process/initAbeForProcesses.js b/src/cli/process/initAbeForProcesses.js index 9d3ef3b0..8705a056 100644 --- a/src/cli/process/initAbeForProcesses.js +++ b/src/cli/process/initAbeForProcesses.js @@ -18,7 +18,7 @@ export function getTime() { } export function init(processName, conf) { - var p = new Promise((resolve, reject) => { + var p = new Promise((resolve) => { log = debug(processName + ':log') log.color = 2 @@ -43,11 +43,11 @@ export function init(processName, conf) { abeExtend.hooks.instance.trigger('afterHandlebarsHelpers', Handlebars) Manager.instance.init() - .then(()=> { + .then(()=> { dateStart = moment() resolve() }) - .catch((e) => { + .catch((e) => { error('publish-all' + e) }) }else { From 7bd93e7dfb360204374c9f23f3f0b83a66a66a3c Mon Sep 17 00:00:00 2001 From: wonknu10 Date: Wed, 26 Oct 2016 14:37:08 +0200 Subject: [PATCH 2/3] fix: css class status after save don't update --- src/server/public/scripts/modules/EditorSave.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/server/public/scripts/modules/EditorSave.js b/src/server/public/scripts/modules/EditorSave.js index 7c994b31..7c986a77 100755 --- a/src/server/public/scripts/modules/EditorSave.js +++ b/src/server/public/scripts/modules/EditorSave.js @@ -145,6 +145,11 @@ export default class EditorSave { if(result.success === 1) { window.json = result.json } + var formWrapper = document.querySelector('#abeForm') + formWrapper.classList.forEach(function (classStr) { + if(classStr.indexOf('status-') > -1) formWrapper.classList.remove(classStr) + }) + formWrapper.classList.add('status-' + result.json.abe_meta.status) this.onFileSaved._fire() }).catch(function(e) { console.error(e) From e7e54182475b3797fd1079b643a7b695177432a1 Mon Sep 17 00:00:00 2001 From: wonknu10 Date: Wed, 26 Oct 2016 14:38:47 +0200 Subject: [PATCH 3/3] 2.5.23 --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 0bbc9167..2d3d4102 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "abe-cli", - "version": "2.5.22", + "version": "2.5.23", "description": "Abe command line tool", "main": "src/server/app.js", "repository": {