Merge pull request #726 from joshholl/master

See #524. Added pretty diff ternaryline option
This commit is contained in:
Glavin Wiechert 2016-02-20 15:17:41 -04:00
commit bdcccf8036
2 changed files with 25 additions and 0 deletions

View File

@ -1353,6 +1353,30 @@ Break chained method calls across subsequent lines (Supported by JS Beautify, Pr
} }
``` ```
#### [JavaScript - Preserve Ternary On Single Line](#javascript---preserve-ternary-lines)
**Namespace**: `js`
**Key**: `preserve_ternary_lines`
**Type**: `boolean`
**Supported Beautifiers**: [`JS Beautify`](#js-beautify) [`Pretty Diff`](#pretty-diff)
**Description**:
Preserve ternary methods on a single line (Supported by JS Beautify, Pretty Diff)
**Example `.jsbeautifyrc` Configuration**
```json
{
"js": {
"preserve_ternary_lines": true
}
}
```
#### [JavaScript - Keep array indentation](#javascript---keep-array-indentation) #### [JavaScript - Keep array indentation](#javascript---keep-array-indentation)
**Namespace**: `js` **Namespace**: `js`

View File

@ -33,6 +33,7 @@ module.exports = class PrettyDiff extends Beautifier
if (break_chained_methods is true ) then \ if (break_chained_methods is true ) then \
false else true false else true
] ]
ternaryline: "preserve_ternary_lines"
# Apply language-specific options # Apply language-specific options
CSV: true CSV: true
Coldfusion: true Coldfusion: true