Change "spaces" to "when"

jsx-eslint · Jun 11, 2017 · 7b9d9ad · 7b9d9ad
1 parent c9e9ded
commit 7b9d9ad
Show file tree

Hide file tree

Showing 2 changed files with 103 additions and 103 deletions.
diff --git a/lib/rules/jsx-curly-spacing.js b/lib/rules/jsx-curly-spacing.js
@@ -36,7 +36,7 @@ module.exports = {
         basicConfig: {
           type: 'object',
           properties: {
-            spaces: {
+            when: {
               enum: SPACING_VALUES
             },
             allowMultiline: {
@@ -78,30 +78,30 @@ module.exports = {
 
     function normalizeConfig(configOrTrue, defaults, lastPass) {
       var config = configOrTrue === true ? {} : configOrTrue;
-      var spaces = config.spaces || defaults.spaces;
+      var when = config.when || defaults.when;
       var allowMultiline = has(config, 'allowMultiline') ? config.allowMultiline : defaults.allowMultiline;
       var spacing = config.spacing || {};
       var objectLiteralSpaces = spacing.objectLiterals || defaults.objectLiteralSpaces;
       if (lastPass) {
         // On the final pass assign the values that should be derived from others if they are still undefined
-        objectLiteralSpaces = objectLiteralSpaces || spaces;
+        objectLiteralSpaces = objectLiteralSpaces || when;
       }
 
       return {
-        spaces,
+        when,
         allowMultiline,
         objectLiteralSpaces
       };
     }
 
-    var DEFAULT_SPACING = SPACING.never;
+    var DEFAULT_WHEN = SPACING.never;
     var DEFAULT_ALLOW_MULTILINE = true;
     var DEFAULT_ATTRIBUTES = true;
 
     var sourceCode = context.getSourceCode();
     var originalConfig = context.options[0] || {};
     var defaultConfig = normalizeConfig(originalConfig, {
-      spaces: DEFAULT_SPACING,
+      when: DEFAULT_WHEN,
       allowMultiline: DEFAULT_ALLOW_MULTILINE
     });
     var attributes = has(originalConfig, 'attributes') ? originalConfig.attributes : DEFAULT_ATTRIBUTES;
@@ -261,7 +261,7 @@ module.exports = {
       }
 
       var isObjectLiteral = first.value === second.value;
-      var spacing = isObjectLiteral ? config.objectLiteralSpaces : config.spaces;
+      var spacing = isObjectLiteral ? config.objectLiteralSpaces : config.when;
       if (spacing === SPACING.always) {
         if (!sourceCode.isSpaceBetweenTokens(first, second)) {
           reportRequiredBeginningSpace(node, first);