Mirrors
/
atom-beautify
mirror of https://github.com/Glavin001/atom-beautify.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Update dependencies, tests, docs

This commit is contained in:
Glavin Wiechert 2015-06-25 09:06:05 -03:00
parent 5d0de01938
commit a2efade4b3
24 changed files with 80 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/options.md
View File

@ -1197,7 +1197,7 @@ Disable ERB Beautification
**Key**: `language_erb_default_beautifier` **Key**: `language_erb_default_beautifier`
**Default**: `HTML Beautifier` **Default**: `Pretty Diff`
**Type**: `string` **Type**: `string`

1
examples/nested-jsbeautifyrc/html-erb/expected/test.erb
View File

@ -1,4 +1,5 @@
<DOCTYPE "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" PUBLIC html> <DOCTYPE "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" PUBLIC html>
<html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml"> <html lang="en" xml:lang="en" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type"/> <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>

2
examples/nested-jsbeautifyrc/less/expected/test.less
View File

@ -24,4 +24,4 @@ a {
background-color: @green; background-color: @green;
} }
} }
} }

3
examples/nested-jsbeautifyrc/less/expected/test2.less
View File

@ -79,6 +79,7 @@
height: 340px; height: 340px;
margin: 2% auto; margin: 2% auto;
} }
//container //container
> div { > div {
text-align: center; text-align: center;
@ -166,4 +167,4 @@
opacity: 0; opacity: 0;
display: none; display: none;
} }
} }

4
examples/nested-jsbeautifyrc/less/expected/test3.less
View File

@ -2,11 +2,13 @@
.mixin(@variable, @anotherVariable) { .mixin(@variable, @anotherVariable) {
} }
// Works // Works
.mixin(@variable; @anotherVariable) { .mixin(@variable; @anotherVariable) {
} }
// Ok // Ok
.mixin(@variable) { .mixin(@variable) {
} }

2
examples/nested-jsbeautifyrc/less/expected/test4.less
View File

@ -14,4 +14,4 @@ div.photo-view {
display: block; display: block;
} }
} }
} }

2
examples/nested-jsbeautifyrc/less/expected/test5.less
View File

@ -6,4 +6,4 @@
&:hover { &:hover {
color: green; color: green;
} }
} }

0
examples/nested-jsbeautifyrc/less/original/_test2.less → examples/nested-jsbeautifyrc/less/original/test2.less
View File

0
examples/nested-jsbeautifyrc/less/original/_test3.less → examples/nested-jsbeautifyrc/less/original/test3.less
View File

8
examples/nested-jsbeautifyrc/sass/expected/alphasort1.scss
View File

@ -1,6 +1,4 @@
.example() { .example() {
.base-apple(); .apple-color(@color-green); // Sets apple color to green
// Sets base apple color to red .base-apple(); // Sets base apple color to red
.apple-color(@color-green); }
// Sets apple color to green
}

2
examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss
View File

@ -5,4 +5,4 @@
a#{$parent}:hover { a#{$parent}:hover {
color: darken($color, 10%); color: darken($color, 10%);
} }
} }

1
examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss
View File

@ -1,5 +1,6 @@
/* kendo UI */ /* kendo UI */
@import "variables"; @import "variables";
// slider // slider
.k-slider-track { .k-slider-track {
background-color: $gray-light; background-color: $gray-light;

2
examples/nested-jsbeautifyrc/sass/expected/test.sass
View File

@ -3,4 +3,4 @@ a {
&:hover { &:hover {
color: blue; color: blue;
} }
} }

4
examples/nested-jsbeautifyrc/sass/expected/test.scss
View File

@ -2,11 +2,13 @@
.container { .container {
.cta--primary { .cta--primary {
&:visited { &:visited {
//whatever //whatever
} }
&::before { &::before {
//whatever //whatever
} }
} }
} }
} }

0
examples/nested-jsbeautifyrc/sass/original/_kendo_ui.scss → examples/nested-jsbeautifyrc/sass/original/kendo_ui.scss
View File

0
examples/nested-jsbeautifyrc/sass/original/_test.scss → examples/nested-jsbeautifyrc/sass/original/test.scss
View File

5
examples/simple-jsbeautifyrc/javascript/expected/test.json
View File

@ -7,6 +7,5 @@
"preserve_newlines": true, "preserve_newlines": true,
"max_preserve_newlines": 2, "max_preserve_newlines": 2,
/* test * /* test *
"jslint_happy": true "jslint_happy": true
} }
*/

70
examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss
View File

@ -1,24 +1,28 @@
"Window" : "Window": {
{ exitOnClose: true, exitOnClose: true,
backgroundColor: "#fff", backgroundColor: "#fff",
title: "Kochgut" title: "Kochgut"
} }
"Label" :
{ width: Ti.UI.SIZE, "Label": {
width: Ti.UI.SIZE,
height: Ti.UI.SIZE, height: Ti.UI.SIZE,
color: "#555", color: "#555",
touchEnabled: false touchEnabled: false
} }
"Button" :
{ backgroundColor: "#03a9f4", "Button": {
backgroundColor: "#03a9f4",
color: "#fff", color: "#fff",
borderRadius: 2 borderRadius: 2
} }
"#menu" :
{ backgroundImage: "/images/bg.png" "#menu": {
backgroundImage: "/images/bg.png"
} }
".button" :
{ backgroundColor: "#03a9f4", ".button": {
backgroundColor: "#03a9f4",
color: "#fff", color: "#fff",
borderRadius: 2, borderRadius: 2,
width: Ti.UI.SIZE, width: Ti.UI.SIZE,
@ -26,60 +30,68 @@
top: 16, top: 16,
bottom: 16 bottom: 16
} }
".lbl_button" :
{ left: 20, ".lbl_button": {
left: 20,
right: 20, right: 20,
color: "#fff" color: "#fff"
} }
".headline" :
{ color: "#aaa", ".headline": {
color: "#aaa",
left: 16, left: 16,
height: 48, height: 48,
font: { font: {
fontWeight: "bold" fontWeight: "bold"
} }
} }
".grid" :
{ left: 2, ".grid": {
left: 2,
right: 2, right: 2,
layout: "horizontal", layout: "horizontal",
height: Ti.UI.SIZE height: Ti.UI.SIZE
} }
".card [platform=tablet]" :
{ width: "33%", ".card [platform=tablet]": {
width: "33%",
height: 150, height: 150,
bottom: 2 bottom: 2
} }
".card" :
{ width: "50%", ".card": {
width: "50%",
height: 150, height: 150,
bottom: 2 bottom: 2
} }
".padding" :
{ right: 2, ".padding": {
right: 2,
left: 0, left: 0,
top: 0, top: 0,
bottom: 0, bottom: 0,
backgroundImage: "/images/essen.jpg" backgroundImage: "/images/essen.jpg"
} }
".card_overlay" : ".card_overlay": {
{ bottom: 0, bottom: 0,
left: 0, left: 0,
right: 0, right: 0,
height: 48 height: 48
} }
".card_overlay_bg" :
{ left: 0, ".card_overlay_bg": {
left: 0,
right: 0, right: 0,
bottom: 0, bottom: 0,
top: 0, top: 0,
backgroundColor: "#000", backgroundColor: "#000",
opacity: 0.3 opacity: 0.3
} }
".card_lbl" :
{ color: "#fff", ".card_lbl": {
color: "#fff",
left: 16, left: 16,
font: { font: {
fontSize: 16 fontSize: 16
} }
} }

8
examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss
View File

@ -1,12 +1,12 @@
".container" : ".container": {
{ backgroundImage: 'images/bgbg-builder.png', backgroundImage: 'images/bgbg-builder.png',
width: 1024, width: 1024,
height: 752, height: 752,
top: 0, top: 0,
left: 0 left: 0
}, },
"#blackArrow" : "#blackArrow": {
{ touchEnabled: false, touchEnabled: false,
backgroundImage: 'images/arrow-builder.png', backgroundImage: 'images/arrow-builder.png',
width: 15, width: 15,
height: 10, height: 10,

2
examples/simple-jsbeautifyrc/visualforce/expected/basic-page-using-detail.page
View File

@ -1,3 +1,5 @@
<apex:page standardController="Contact"> <apex:page standardController="Contact">
<apex:detail/> <apex:detail/>
</apex:page> </apex:page>

2
examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page
View File

@ -1,3 +1,5 @@
<apex:page standardController="Contact"> <apex:page standardController="Contact">
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/> <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
</apex:page> </apex:page>

5
examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page
View File

@ -1,6 +1,8 @@
<apex:page standardController="Contact"> <apex:page standardController="Contact">
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/> <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
<apex:form>
<apex:form >
<apex:pageBlock title="Contact"> <apex:pageBlock title="Contact">
<apex:pageBlockSection title="Editing"> <apex:pageBlockSection title="Editing">
<apex:inputfield value="{!contact.firstname}"/> <apex:inputfield value="{!contact.firstname}"/>
@ -11,4 +13,5 @@
</apex:pageBlockSection> </apex:pageBlockSection>
</apex:pageBlock> </apex:pageBlock>
</apex:form> </apex:form>
</apex:page> </apex:page>

3
examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page
View File

@ -1,5 +1,7 @@
<apex:page standardController="Contact"> <apex:page standardController="Contact">
<apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/> <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
<apex:pageBlock title="Contact"> <apex:pageBlock title="Contact">
<apex:pageBlockSection title="Details"> <apex:pageBlockSection title="Details">
<apex:outputfield value="{!contact.firstname}"/> <apex:outputfield value="{!contact.firstname}"/>
@ -8,4 +10,5 @@
<apex:outputfield value="{!contact.birthdate}"/> <apex:outputfield value="{!contact.birthdate}"/>
</apex:pageBlockSection> </apex:pageBlockSection>
</apex:pageBlock> </apex:pageBlock>
</apex:page> </apex:page>

6
package.json
View File

@ -56,7 +56,7 @@
"async": "^1.2.1", "async": "^1.2.1",
"atom-message-panel": "^1.2.4", "atom-message-panel": "^1.2.4",
"atom-space-pen-views": "^2.0.5", "atom-space-pen-views": "^2.0.5",
"bluebird": "^2.9.27", "bluebird": "^2.9.30",
"coffee-fmt": "0.11.0", "coffee-fmt": "0.11.0",
"coffee-formatter": "^0.1.2", "coffee-formatter": "^0.1.2",
"cross-spawn": "^0.4.1", "cross-spawn": "^0.4.1",
@ -68,12 +68,12 @@
"expand-home-dir": "0.0.2", "expand-home-dir": "0.0.2",
"extend": "^2.0.1", "extend": "^2.0.1",
"handlebars": "^3.0.3", "handlebars": "^3.0.3",
"js-beautify": "^1.5.6", "js-beautify": "^1.5.7",
"lodash": "3.9.3", "lodash": "3.9.3",
"loophole": "^1.0.0", "loophole": "^1.0.0",
"node-dir": "^0.1.8", "node-dir": "^0.1.8",
"node-uuid": "^1.4.3", "node-uuid": "^1.4.3",
"prettydiff": "^1.11.21", "prettydiff": "^1.12.8",
"space-pen": "^5.1.1", "space-pen": "^5.1.1",
"strip-json-comments": "^1.0.2", "strip-json-comments": "^1.0.2",
"temp": "^0.8.3", "temp": "^0.8.3",