@@ -157,7 +168,7 @@ export function createInputImage(attributes, inputClass, params) {
`
}
-export function createInputText(attributes, inputClass, params) {
+export function createInputText(attributes, inputClass) {
return `
diff --git a/src/cli/cms/operations/create.js b/src/cli/cms/operations/create.js
index fff0b5f0..c019eecc 100644
--- a/src/cli/cms/operations/create.js
+++ b/src/cli/cms/operations/create.js
@@ -1,6 +1,5 @@
import path from 'path'
import {
- Manager,
coreUtils,
cmsTemplates,
cmsOperations,
diff --git a/src/cli/cms/operations/remove.js b/src/cli/cms/operations/remove.js
index 9a6c8b2d..5ee92cae 100644
--- a/src/cli/cms/operations/remove.js
+++ b/src/cli/cms/operations/remove.js
@@ -2,7 +2,6 @@ import fse from 'fs-extra'
import path from 'path'
import {
- config,
abeExtend,
cmsData,
coreUtils,
diff --git a/src/cli/cms/structure/structure.js b/src/cli/cms/structure/structure.js
index ada1ff56..c0158d75 100644
--- a/src/cli/cms/structure/structure.js
+++ b/src/cli/cms/structure/structure.js
@@ -1,10 +1,5 @@
-import path from 'path'
-
import {
- coreUtils,
- cmsStructure,
- cmsData,
- config
+ coreUtils
} from '../../'
export function editStructure(type, folderPath) {
diff --git a/src/cli/cms/templates/handlebars/attrAbe.js b/src/cli/cms/templates/handlebars/attrAbe.js
index c91836e9..d563f5e1 100755
--- a/src/cli/cms/templates/handlebars/attrAbe.js
+++ b/src/cli/cms/templates/handlebars/attrAbe.js
@@ -1,5 +1,4 @@
import Handlebars from 'handlebars'
-import abeEngine from '../../../'
/**
* Print properties inside html tag
diff --git a/src/cli/cms/templates/handlebars/isAuthorized.js b/src/cli/cms/templates/handlebars/isAuthorized.js
index c6a4ec17..5c83bc75 100644
--- a/src/cli/cms/templates/handlebars/isAuthorized.js
+++ b/src/cli/cms/templates/handlebars/isAuthorized.js
@@ -1,5 +1,4 @@
import {
- config,
User
} from '../../../'
diff --git a/src/cli/cms/templates/prepare.js b/src/cli/cms/templates/prepare.js
index 6359cfda..dfda0829 100755
--- a/src/cli/cms/templates/prepare.js
+++ b/src/cli/cms/templates/prepare.js
@@ -35,24 +35,22 @@ export function addHasAbeAttr(text) {
export function getAbeAttributeData(match, text, htmlAttribute, abeTag) {
var valueOfAttritube
var key = cmsData.regex.getAttr(match, 'key')
- var getattr
var res
if (cmsData.regex.isSingleAbe(match, text)) {
valueOfAttritube = key.replace(/\./g, '-')
key = cmsData.regex.validDataAbe(valueOfAttritube)
- getattr = key.replace(/\./g, '-')
- res = ' data-abe-attr-' + valueOfAttritube + '="' + htmlAttribute + '"' + ' data-abe-' + valueOfAttritube + '="' + getattr + '"' + abeTag
+ key = key.replace(/\./g, '-')
+ res = ' data-abe-attr-' + valueOfAttritube + '="' + htmlAttribute + '"' + ' data-abe-' + valueOfAttritube + '="' + key + '"' + abeTag
}else {
- var valueOfAttritube = key.split('.')
+ valueOfAttritube = key.split('.')
var parentKey = valueOfAttritube.shift()
valueOfAttritube = `${parentKey}[index].${valueOfAttritube[0]}`
var valueOfAttritubeIndexed = valueOfAttritube.replace(/\[index\]/, '{{@index}}')
key = cmsData.regex.validDataAbe(valueOfAttritube)
- getattr = key
- res = ` data-abe-attr-${valueOfAttritube}="${htmlAttribute}" data-abe-${valueOfAttritube}="${getattr}"`
- + ` data-abe-attr-${valueOfAttritubeIndexed}="${htmlAttribute}" data-abe-${valueOfAttritubeIndexed}="${getattr}"${abeTag}`
+ res = ` data-abe-attr-${valueOfAttritube}="${htmlAttribute}" data-abe-${valueOfAttritube}="${key}"`
+ + ` data-abe-attr-${valueOfAttritubeIndexed}="${htmlAttribute}" data-abe-${valueOfAttritubeIndexed}="${key}"${abeTag}`
}
return res
@@ -83,7 +81,7 @@ data-abe-image_key="image_key" src="{{abe type='image' key='image_key' tab='defa
* @param {[type]} template [description]
*/
-export function addAbeDataAttrForHtmlAttributes(template, key) {
+export function addAbeDataAttrForHtmlAttributes(template) {
var text = template.replace(/<([A-Za-z]+)/g, '\nABE_SPLIT<$1')
let abeTagIntoAttribute = text.match(cmsData.regex.abeAsAttributePattern)
diff --git a/src/cli/core/manager/Manager.js b/src/cli/core/manager/Manager.js
index 7694c42d..03cbb40b 100644
--- a/src/cli/core/manager/Manager.js
+++ b/src/cli/core/manager/Manager.js
@@ -70,18 +70,18 @@ class Manager {
try {
fse.accessSync(this._pathTemplate, fse.F_OK)
this._watchTemplateFolder = watch.createMonitor(this._pathTemplate, (monitor) => {
- monitor.on('created', (f, stat) => {
+ monitor.on('created', () => {
this.getKeysFromSelect()
this.updateStructureAndTemplates()
this.events.template.emit('update')
})
- monitor.on('changed', (f, curr, prev) => {
+ monitor.on('changed', () => {
this.getKeysFromSelect()
this.updateStructureAndTemplates()
this.events.template.emit('update')
})
- monitor.on('removed', (f, stat) => {
+ monitor.on('removed', () => {
this.getKeysFromSelect()
this.updateStructureAndTemplates()
this.events.template.emit('update')
@@ -95,18 +95,18 @@ class Manager {
try {
fse.accessSync(this._pathPartials, fse.F_OK)
this._watchPartialsFolder = watch.createMonitor(this._pathPartials, (monitor) => {
- monitor.on('created', (f, stat) => {
+ monitor.on('created', () => {
this.getKeysFromSelect()
this.updateStructureAndTemplates()
this.events.template.emit('update')
})
- monitor.on('changed', (f, curr, prev) => {
+ monitor.on('changed', () => {
this.getKeysFromSelect()
this.updateStructureAndTemplates()
this.events.template.emit('update')
})
- monitor.on('removed', (f, stat) => {
+ monitor.on('removed', () => {
this.getKeysFromSelect()
this.updateStructureAndTemplates()
this.events.template.emit('update')
@@ -119,15 +119,15 @@ class Manager {
try {
fse.accessSync(this._pathStructure, fse.F_OK)
this._watchStructure = watch.createMonitor(this._pathStructure, (monitor) => {
- monitor.on('created', (f, stat) => {
+ monitor.on('created', () => {
this.updateStructureAndTemplates()
this.events.structure.emit('update')
})
- monitor.on('changed', (f, curr, prev) => {
+ monitor.on('changed', () => {
this.updateStructureAndTemplates()
this.events.structure.emit('update')
})
- monitor.on('removed', (f, stat) => {
+ monitor.on('removed', () => {
this.updateStructureAndTemplates()
this.events.structure.emit('update')
})
@@ -139,16 +139,16 @@ class Manager {
try {
fse.accessSync(this._pathReference, fse.F_OK)
this._watchReferenceFolder = watch.createMonitor(this._pathReference, (monitor) => {
- monitor.on('created', (f, stat) => {
+ monitor.on('created', (f) => {
this.updateReferences(f)
this.events.reference.emit('update')
})
- monitor.on('changed', (f, curr, prev) => {
+ monitor.on('changed', (f) => {
this.updateReferences(f)
this.events.reference.emit('update')
})
- monitor.on('removed', (f, stat) => {
+ monitor.on('removed', () => {
this.updateReferences()
this.events.reference.emit('update')
})
diff --git a/src/cli/core/utils/file.js b/src/cli/core/utils/file.js
index 447fedbe..81483988 100755
--- a/src/cli/core/utils/file.js
+++ b/src/cli/core/utils/file.js
@@ -1,7 +1,6 @@
import Promise from 'bluebird'
import path from 'path'
import mkdirp from 'mkdirp'
-import execPromise from 'child-process-promise'
var fse = Promise.promisifyAll(require('fs-extra'))
import {
diff --git a/src/cli/extend/process.js b/src/cli/extend/process.js
index 76aa4500..9af59b02 100644
--- a/src/cli/extend/process.js
+++ b/src/cli/extend/process.js
@@ -40,7 +40,7 @@ var abeProcess = function(name, args = []) {
}
if(typeof proc !== 'undefined' && proc !== null) {
- proc.on('message', function(msg) {
+ proc.on('message', function() {
abeExtend.lock.remove(name)
proc.kill()
})
diff --git a/src/cli/index.js b/src/cli/index.js
index 4609af8b..595e62ad 100755
--- a/src/cli/index.js
+++ b/src/cli/index.js
@@ -4,8 +4,6 @@ import fse from 'fs-extra'
import mkdirp from 'mkdirp'
import clc from 'cli-color'
-import handlebarsHelperSlugify from 'handlebars-helper-slugify'
-
import {
translate,
cleanTab,
@@ -16,9 +14,7 @@ import {
moduloIf,
attrAbe,
ifIn,
- ifCond,
- isTrue,
- truncate
+ ifCond
} from './cms/templates/index'
import {
diff --git a/src/cli/users/utils.js b/src/cli/users/utils.js
index ee9ef74e..2f068538 100644
--- a/src/cli/users/utils.js
+++ b/src/cli/users/utils.js
@@ -237,7 +237,7 @@ export function getAll() {
return User.manager.instance.get()
}
-export function getUserWorkflow(status, role) {
+export function getUserWorkflow(status) {
var flows = []
function addFlow (flow, type, action) {
@@ -249,7 +249,6 @@ export function getUserWorkflow(status, role) {
}
if (config.users.enable) {
- var before = null
var found = null
Array.prototype.forEach.call(config.users.workflow, (flow) => {
diff --git a/src/index.js b/src/index.js
index 92516cf1..614c0e50 100755
--- a/src/index.js
+++ b/src/index.js
@@ -1,17 +1,11 @@
#!/usr/bin/env node
-import {Promise} from 'bluebird'
import Create from './cli/cms/Create'
import plugins from './cli/extend/plugins'
import {exec} from 'child_process'
import {spawn} from 'child_process'
-import execPromise from 'child-process-promise'
-import mkdirp from 'mkdirp'
-import fse from 'fs-extra'
import path from 'path'
import program from 'commander'
import pkg from '../package'
-import pm2 from 'pm2'
-import clc from 'cli-color'
program
.version(pkg.version)
@@ -50,7 +44,7 @@ program
}
generate.on('close', (code) => {
- console.log(clc.cyan('child process exited with code') + ' ' + code)
+ console.log('child process exited with code ' + code)
process.exit(0)
})
}).on('--help', function() {
@@ -64,7 +58,7 @@ program
.command('create [path]')
.alias('c')
.description('create new abe project')
- .action(function(dest, options){
+ .action(function(dest){
dest = (dest != null) ? dest : ''
var dir = path.join(process.cwd(), dest)
if(process.env.ROOT) {
diff --git a/src/server/helpers/abe-locale.js b/src/server/helpers/abe-locale.js
index 0c6878f3..60ee6a11 100644
--- a/src/server/helpers/abe-locale.js
+++ b/src/server/helpers/abe-locale.js
@@ -20,8 +20,8 @@ if(config.siteLocaleFolder != null){
var pathToSiteLocale = path.join(config.root, config.siteLocaleFolder, config.intlData.locales)
var files = fse.readdirSync(pathToSiteLocale)
Array.prototype.forEach.call(files, (file) => {
- var json = fse.readJsonSync(pathToSiteLocale + '/' + file)
- result = extend(true, result, json)
+ var json = fse.readJsonSync(pathToSiteLocale + '/' + file)
+ result = extend(true, result, json)
})
}
diff --git a/src/server/public/abejs/scripts/modules/EditorAutocomplete.js b/src/server/public/abejs/scripts/modules/EditorAutocomplete.js
index 31082b46..62bc4db4 100755
--- a/src/server/public/abejs/scripts/modules/EditorAutocomplete.js
+++ b/src/server/public/abejs/scripts/modules/EditorAutocomplete.js
@@ -252,7 +252,7 @@ export default class EditorAutocomplete {
_get(obj, path) {
return path.split('.').reduce(function(prev, curr) {
return prev ? prev[curr] : undefined
- }, obj || self)
+ }, obj || this)
}
/**
diff --git a/src/server/public/abejs/scripts/modules/EditorReferences.js b/src/server/public/abejs/scripts/modules/EditorReferences.js
index 4ab6248c..7c2ba0d9 100644
--- a/src/server/public/abejs/scripts/modules/EditorReferences.js
+++ b/src/server/public/abejs/scripts/modules/EditorReferences.js
@@ -1,6 +1,5 @@
/*global document */
-import Handlebars from 'handlebars'
import Nanoajax from 'nanoajax'
import qs from 'qs'
diff --git a/src/server/public/abejs/scripts/modules/EditorStructures.js b/src/server/public/abejs/scripts/modules/EditorStructures.js
index b2763699..d2ea6c7f 100644
--- a/src/server/public/abejs/scripts/modules/EditorStructures.js
+++ b/src/server/public/abejs/scripts/modules/EditorStructures.js
@@ -6,7 +6,7 @@ import qs from 'qs'
export default class EditorStructures {
constructor() {
var struc = document.querySelector('.structure-json')
- if(!(struc != null)) return;
+ if(!(struc != null)) return
this._ajax = Nanoajax.ajax
this.datas = JSON.parse(struc.value)
this.structureWrapper = document.querySelector('.structure-wrapper')
diff --git a/src/server/routes/get-list-workflow.js b/src/server/routes/get-list-workflow.js
index d55c3df6..dc692599 100644
--- a/src/server/routes/get-list-workflow.js
+++ b/src/server/routes/get-list-workflow.js
@@ -28,13 +28,13 @@ var route = function(router, req, res, next) {
var workflowUrl = {}
var previous = ''
- var next = ''
+ var nextWorkflow = ''
Array.prototype.forEach.call(config.users.workflow, (flow) => {
var current = false
if (flow != 'publish') {
Array.prototype.forEach.call(config.users.workflow, (flowCheck) => {
if (current) {
- next = flowCheck
+ nextWorkflow = flowCheck
current = false
}
if (flow === flowCheck) {
@@ -42,16 +42,16 @@ var route = function(router, req, res, next) {
}
})
}else {
- next = 'draft'
+ nextWorkflow = 'draft'
}
workflowUrl[flow] = [
- {url: `/abe/operations/edit/${flow}`, action: 'edit', workflow: flow, previous: previous, next: next},
- {url: `/abe/operations/delete/${flow}`, action: 'delete', workflow: flow, previous: previous, next: next},
- {url: `/abe/operations/submit/${flow}`, action: 'submit', workflow: flow, previous: previous, next: next}
+ {url: `/abe/operations/edit/${flow}`, action: 'edit', workflow: flow, previous: previous, next: nextWorkflow},
+ {url: `/abe/operations/delete/${flow}`, action: 'delete', workflow: flow, previous: previous, next: nextWorkflow},
+ {url: `/abe/operations/submit/${flow}`, action: 'submit', workflow: flow, previous: previous, next: nextWorkflow}
]
if (flow !== 'draft') {
- workflowUrl[flow].push({url: `/abe/operations/reject/${flow}`, action: 'reject', workflow: flow, previous: previous, next: next})
+ workflowUrl[flow].push({url: `/abe/operations/reject/${flow}`, action: 'reject', workflow: flow, previous: previous, next: nextWorkflow})
}
previous = flow
})
diff --git a/src/server/routes/get-reference.js b/src/server/routes/get-reference.js
index 9830ce48..08eed228 100644
--- a/src/server/routes/get-reference.js
+++ b/src/server/routes/get-reference.js
@@ -5,8 +5,7 @@ import {
Manager,
coreUtils,
config,
- Handlebars,
- User
+ Handlebars
} from '../../cli'
var route = function(req, res){
diff --git a/src/server/routes/get-structure.js b/src/server/routes/get-structure.js
index 4efe31f3..b203194a 100644
--- a/src/server/routes/get-structure.js
+++ b/src/server/routes/get-structure.js
@@ -5,8 +5,7 @@ import {
Manager,
coreUtils,
config,
- Handlebars,
- User
+ Handlebars
} from '../../cli'
var route = function(req, res){
diff --git a/src/server/routes/operations/get/unpublish.js b/src/server/routes/operations/get/unpublish.js
index fe379133..1b110f0c 100644
--- a/src/server/routes/operations/get/unpublish.js
+++ b/src/server/routes/operations/get/unpublish.js
@@ -1,7 +1,6 @@
import {
cmsOperations
,abeExtend
- ,cmsData
} from '../../../../cli'
var route = function(req, res, next){