merge from master

CHANGELOG.md

@@ -1,4 +1,12 @@
 
+## [2.8.2] - 2016-11-24
+* [[`b34b5f1c87`](https://github.com/AdFabConnect/abejs/commit/b34b5f1c87)] - Merge pull request #38 from AdFabConnect/bug-2.8.1 (Greg Besson) 
+* [[`0712b583fc`](https://github.com/AdFabConnect/abejs/commit/0712b583fc)] - Merge pull request #37 from marcbachmann/update-uuid (Greg Besson) 
+* [[`836379157b`](https://github.com/AdFabConnect/abejs/commit/836379157b)] - **fix**: bug abejs form multiple precontrib was selected on queryselector for structure path url (nicolaslabbe) 
+* [[`487d28817a`](https://github.com/AdFabConnect/abejs/commit/487d28817a)] - **fix**: tab slug autocomplete remove result glyph not visible (nicolaslabbe) 
+* [[`ca8528b5c6`](https://github.com/AdFabConnect/abejs/commit/ca8528b5c6)] - chore(package): update uuid to version 3.0.0 (Marc Bachmann) 
+* [[`75b643bc40`](https://github.com/AdFabConnect/abejs/commit/75b643bc40)] - **doc**: changelog (gregorybesson) 
+
 ## [2.8.1] - 2016-11-21
 
 ## [2.8.0] - 2016-11-21

package.json

@@ -1,6 +1,6 @@
 {
   "name": "abe-cli",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "Abe command line tool",
   "main": "src/server/app.js",
   "repository": {
@@ -68,7 +68,6 @@
     "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",
@@ -77,6 +76,7 @@
     "qs": "^6.0.1",
     "request": "^2.69.0",
     "smartcrop-cli": "^1.0.2",
+    "uuid": "^3.0.0",
     "watch": "^1.0.1",
     "which": "^1.2.11",
     "xss": "^0.2.10"

src/server/app.js

@@ -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 {
   config,
@@ -201,4 +201,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))

src/server/public/scripts/modules/FormCreate.js

@@ -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'))) {

src/server/sass/modules/_editor.scss

@@ -14,6 +14,12 @@
   word-break: break-all;
 }
 
+#slug {
+  .autocomplete-result .glyphicon.glyphicon-remove {
+    display: inline-block;
+  }
+}
+
 .manager-wrapper {
   .form-create {
     padding: 0px 20px;