Skip to content

Commit

Permalink
Merge branch 'master'
Browse files Browse the repository at this point in the history
Conflicts:
	src/server/app.js
  • Loading branch information
nicolaslabbe committed Nov 24, 2016
2 parents 425b19a + b34b5f1 commit 201e894
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 4 deletions.
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -68,14 +68,14 @@
"moment": "^2.15.2",
"nanoajax": "^0.4.0",
"node-sqlparser": "^1.0.2",
"node-uuid": "^1.4.7",
"on": "^1.3.0",
"openurl": "^1.1.0",
"pm2": "^2.0.18",
"prettyjson": "^1.1.3",
"prompt": "^1.0.0",
"qs": "^6.0.1",
"request": "^2.69.0",
"uuid": "^3.0.0",
"watch": "^1.0.1",
"which": "^1.2.11",
"xss": "^0.2.10",
Expand Down
4 changes: 2 additions & 2 deletions src/server/app.js
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import path from 'path'
import busboy from 'connect-busboy'
import clc from 'cli-color'
import openurl from 'openurl'
import uuid from 'node-uuid'
import uuid from 'uuid'
import flash from 'connect-flash'
import cookieParser from 'cookie-parser'
import csrf from 'csurf'
Expand Down Expand Up @@ -218,4 +218,4 @@ var controllers = require('./controllers')
app.use(controllers.default)

// This static path is mandatory for relative path to statics in templates
app.use('/abe', express.static(publish))
app.use('/abe', express.static(publish))
2 changes: 1 addition & 1 deletion src/server/public/scripts/modules/FormCreate.js
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ export default class FormCreate {
}.bind(this))
}

var slugPaths = document.querySelectorAll('[data-slug-type=path]')
var slugPaths = this._form.querySelectorAll('[data-slug-type=path]')
Array.prototype.forEach.call(slugPaths, function(slugPath) {
var isStructureFolder = (slugPath.parentNode.getAttribute('data-shown') != null)
if (slugPath.value != null && slugPath.value != '' && (isStructureFolder && !slugPath.parentNode.classList.contains('hidden'))) {
Expand Down
6 changes: 6 additions & 0 deletions src/server/sass/modules/_editor.scss
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,12 @@
word-break: break-all;
}

#slug {
.autocomplete-result .glyphicon.glyphicon-remove {
display: inline-block;
}
}

.manager-wrapper {
.form-create {
padding: 0px 20px;
Expand Down

0 comments on commit 201e894

Please sign in to comment.