Merge branch 'master' of https://github.com/hayatae/atom-beautify into hayatae-master

This commit is contained in:
Glavin Wiechert 2015-11-02 14:11:58 -04:00
commit f36a1d15e2
4 changed files with 56 additions and 32 deletions

View File

@ -1306,11 +1306,11 @@ Add a space before an anonymous function's parens, ie. function () (Supported by
**Type**: `boolean`
**Supported Beautifiers**: [`JS Beautify`](#js-beautify)
**Supported Beautifiers**: [`JS Beautify`](#js-beautify) [`Pretty Diff`](#pretty-diff)
**Description**:
Break chained method calls across subsequent lines (Supported by JS Beautify)
Break chained method calls across subsequent lines (Supported by JS Beautify, Pretty Diff)
**Example `.jsbeautifyrc` Configuration**
@ -5331,11 +5331,11 @@ Add a space before an anonymous function's parens, ie. function () (Supported by
**Type**: `boolean`
**Supported Beautifiers**: [`JS Beautify`](#js-beautify)
**Supported Beautifiers**: [`JS Beautify`](#js-beautify) [`Pretty Diff`](#pretty-diff)
**Description**:
Break chained method calls across subsequent lines (Supported by JS Beautify)
Break chained method calls across subsequent lines (Supported by JS Beautify, Pretty Diff)
**Example `.jsbeautifyrc` Configuration**
@ -6000,6 +6000,30 @@ Add a space before an anonymous function's parens, ie. function () (Supported by
}
```
#### [JavaScript - Break chained methods](#javascript---break-chained-methods)
**Namespace**: `js`
**Key**: `break_chained_methods`
**Type**: `boolean`
**Supported Beautifiers**: [`JS Beautify`](#js-beautify) [`Pretty Diff`](#pretty-diff)
**Description**:
Break chained method calls across subsequent lines (Supported by JS Beautify, Pretty Diff)
**Example `.jsbeautifyrc` Configuration**
```json
{
"js": {
"break_chained_methods": false
}
}
```
#### [JavaScript - Wrap line length](#javascript---wrap-line-length)
**Namespace**: `js`

View File

@ -3,27 +3,26 @@
<xsl:stylesheet version="2.0" xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
<xsl:output doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN"
encoding="utf-8" indent="yes" method="html"/>
<xsl:output doctype-public="-//W3C//DTD HTML 4.01 Transitional//EN" encoding="utf-8" indent="yes" method="html"/>
<xsl:template match="/">
<html>
<head>
<title>Sample xml transformation</title>
</head>
<body>
<xsl:template match="/">
<html>
<head>
<title>Sample xml transformation</title>
</head>
<body>
<xsl:for-each select="/letter">
<div>
<div><xsl:value-of select="./title"/></div>
<div><xsl:value-of select="./salutation"/></div>
<div><xsl:value-of select="./text"/></div>
<div><xsl:value-of select="./greetings"/></div>
<div><xsl:value-of select="./signature"/></div>
<div><xsl:value-of select="./address"/></div>
</div>
</xsl:for-each>
</body>
</html>
</xsl:template>
</xsl:stylesheet>
<xsl:for-each select="/letter">
<div>
<div><xsl:value-of select="./title"/></div>
<div><xsl:value-of select="./salutation"/></div>
<div><xsl:value-of select="./text"/></div>
<div><xsl:value-of select="./greetings"/></div>
<div><xsl:value-of select="./signature"/></div>
<div><xsl:value-of select="./address"/></div>
</div>
</xsl:for-each>
</body>
</html>
</xsl:template>
</xsl:stylesheet>

View File

@ -1,9 +1,6 @@
var Mist = React.createClass({renderList: function() {
return this
.props
.items
.map(function(item) {
return <ListItem item={return <tag>{item}</tag>} key={item.id}/>;
});
return this.props.items.map(function(item) {
return <ListItem item={return <tag>{item}</tag>} key={item.id}/>;
});
}
});

View File

@ -29,6 +29,10 @@ module.exports = class PrettyDiff extends Beautifier
space: "space_after_anon_function"
noleadzero: "no_lead_zero"
endcomma: "end_with_comma"
methodchain: ['break_chained_methods', (break_chained_methods) ->
if (break_chained_methods is true ) then \
false else true
]
# Apply language-specific options
CSV: true
ERB: true