Merged branch master into master

abecms · Oct 26, 2016 · c492ab8 · c492ab8
2 parents 6ae83d9 + e7e5418
commit c492ab8
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 13 deletions.
diff --git 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": {
@@ -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
@@ -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
@@ -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
@@ -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 {

diff --git a/src/server/public/scripts/modules/EditorSave.js b/src/server/public/scripts/modules/EditorSave.js
@@ -122,6 +122,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)