Merge pull request #726 from joshholl/master

See #524. Added pretty diff ternaryline option
Glavin001 · Feb 20, 2016 · bdcccf8 · bdcccf8
2 parents 0dfaefd + a6410d5
commit bdcccf8
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 0 deletions.
diff --git a/docs/options.md b/docs/options.md
@@ -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) 
 
 **Namespace**: `js`

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