From 4574659833a8d1c6c45833bb06743ababa6929e8 Mon Sep 17 00:00:00 2001
From: Sergey Fursov <geyser85@gmail.com>
Date: Sun, 21 Feb 2016 01:31:20 +0300
Subject: [PATCH] rearrange comma-dangle rule to match es5/es6 codestyles,
 fixes #741

---
 packages/eslint-config-airbnb/rules/errors.js | 2 --
 packages/eslint-config-airbnb/rules/es6.js    | 2 ++
 packages/eslint-config-airbnb/rules/legacy.js | 2 ++
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/packages/eslint-config-airbnb/rules/errors.js b/packages/eslint-config-airbnb/rules/errors.js
index ec1b1aab..1c1addf5 100644
--- a/packages/eslint-config-airbnb/rules/errors.js
+++ b/packages/eslint-config-airbnb/rules/errors.js
@@ -1,7 +1,5 @@
 module.exports = {
   'rules': {
-    // disallow trailing commas in object literals
-    'comma-dangle': [2, 'always-multiline'],
     // disallow assignment in conditional expressions
     'no-cond-assign': [2, 'always'],
     // disallow use of console
diff --git a/packages/eslint-config-airbnb/rules/es6.js b/packages/eslint-config-airbnb/rules/es6.js
index e3468434..f28a436b 100644
--- a/packages/eslint-config-airbnb/rules/es6.js
+++ b/packages/eslint-config-airbnb/rules/es6.js
@@ -30,6 +30,8 @@ module.exports = {
     // require space before/after arrow function's arrow
     // https://github.com/eslint/eslint/blob/master/docs/rules/arrow-spacing.md
     'arrow-spacing': [2, { 'before': true, 'after': true }],
+    // require trailing commas in multiline object literals
+    'comma-dangle': [2, 'always-multiline'],
     // verify super() callings in constructors
     'constructor-super': 0,
     // enforce the spacing around the * in generator functions
diff --git a/packages/eslint-config-airbnb/rules/legacy.js b/packages/eslint-config-airbnb/rules/legacy.js
index e94c774f..dc34856f 100644
--- a/packages/eslint-config-airbnb/rules/legacy.js
+++ b/packages/eslint-config-airbnb/rules/legacy.js
@@ -1,5 +1,7 @@
 module.exports = {
   'rules': {
+    // disallow trailing commas in object literals
+    'comma-dangle': [2, 'never'],
     // specify the maximum depth that blocks can be nested
     'max-depth': [0, 4],
     // limits the number of parameters that can be used in the function declaration.