Merge branch 'master' of https://github.com/AdFabConnect/abejs into i…

…mage-size
abecms · Nov 25, 2016 · c27e94d · c27e94d
2 parents a86fb08 + 78d2f90
commit c27e94d
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 10 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+* [[`becb7b9dee`](https://github.com/AdFabConnect/abejs/commit/becb7b9dee)] - Merge pull request #41 from AdFabConnect/fix_abe_update (Greg Besson) 
+* [[`454eeff71f`](https://github.com/AdFabConnect/abejs/commit/454eeff71f)] - **fix**: remove unused dependencies (nicolaslabbe) 
+* [[`b2b4ab0225`](https://github.com/AdFabConnect/abejs/commit/b2b4ab0225)] - **fix**: bug update admin (nicolaslabbe) 
+
+## [2.8.3] - 2016-11-24
+* [[`7bda2d9247`](https://github.com/AdFabConnect/abejs/commit/7bda2d9247)] - **doc**: changelog (gregorybesson) 
 
 ## [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) 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abe-cli",
-  "version": "2.8.3",
+  "version": "2.8.4",
   "description": "Abe command line tool",
   "main": "src/server/app.js",
   "repository": {
@@ -44,12 +44,10 @@
     "body-parser": "^1.14.1",
     "child-process-promise": "^2.1.3",
     "cli-color": "^1.1.0",
-    "cli-table": "^0.3.1",
     "commander": "^2.9.0",
     "connect-busboy": "0.0.2",
     "deepmerge": "^1.1.0",
     "dir-compare": "^1.2.0",
-    "exec": "^0.2.1",
     "express": "^4.13.3",
     "express-handlebars": "^3.0.0",
     "express-secure-handlebars": "^2.1.0",

diff --git a/src/cli/cms/editor/handlebars/sourceAttr.js b/src/cli/cms/editor/handlebars/sourceAttr.js
@@ -46,14 +46,16 @@ function isSelected(currentValue, values) {
   var isEqual = false
   if(typeof currentValue === 'object' && Object.prototype.toString.call(currentValue) === '[object Object]') {
     Array.prototype.forEach.call(values, (value) => {
-      var checkAllEqual = false
-      Array.prototype.forEach.call(Object.keys(value), (key) => {
-        if (currentValue[key] != null && currentValue[key] == value[key] && checkAllEqual == false) {
-          checkAllEqual = true
+      if (value != null) {
+        var checkAllEqual = false
+        Array.prototype.forEach.call(Object.keys(value), (key) => {
+          if (currentValue[key] != null && currentValue[key] == value[key] && checkAllEqual == false) {
+            checkAllEqual = true
+          }
+        })
+        if (checkAllEqual) {
+          isEqual = true
         }
-      })
-      if (checkAllEqual) {
-        isEqual = true
       }
     })
   }else {