Update dependencies, tests, docs

2015-06-25 09:06:05 -03:00 · 2015-06-25 09:06:05 -03:00 · a2efade4b3
parent 5d0de01938
commit a2efade4b3
24 changed files with 80 additions and 54 deletions
--- a/docs/options.md
+++ b/docs/options.md
@ -1197,7 +1197,7 @@ Disable ERB Beautification

 **Key**: `language_erb_default_beautifier`

-**Default**: `HTML Beautifier`
+**Default**: `Pretty Diff`

 **Type**: `string`

--- a/examples/nested-jsbeautifyrc/html-erb/expected/test.erb
+++ b/examples/nested-jsbeautifyrc/html-erb/expected/test.erb
@ -1,4 +1,5 @@
 <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">
        <head>
            <meta content="text/html; charset=utf-8" http-equiv="Content-Type"/>
--- a/examples/nested-jsbeautifyrc/less/expected/test.less
+++ b/examples/nested-jsbeautifyrc/less/expected/test.less
@ -24,4 +24,4 @@ a {
      background-color: @green;
    }
  }
-}
+}
--- a/examples/nested-jsbeautifyrc/less/expected/test2.less
+++ b/examples/nested-jsbeautifyrc/less/expected/test2.less
@ -79,6 +79,7 @@
      height: 340px;
      margin: 2% auto;
    }
+    
    //container
    > div {
      text-align: center;
@ -166,4 +167,4 @@
    opacity: 0;
    display: none;
  }
-}
+}
--- a/examples/nested-jsbeautifyrc/less/expected/test3.less
+++ b/examples/nested-jsbeautifyrc/less/expected/test3.less
@ -2,11 +2,13 @@
 .mixin(@variable, @anotherVariable) {
  
 }
+
 // Works
 .mixin(@variable; @anotherVariable) {
  
 }
+
 // Ok
 .mixin(@variable) {
  
-}
+}
--- a/examples/nested-jsbeautifyrc/less/expected/test4.less
+++ b/examples/nested-jsbeautifyrc/less/expected/test4.less
@ -14,4 +14,4 @@ div.photo-view {
      display: block;
    }
  }
-}
+}
--- a/examples/nested-jsbeautifyrc/less/expected/test5.less
+++ b/examples/nested-jsbeautifyrc/less/expected/test5.less
@ -6,4 +6,4 @@
  &:hover {
    color: green;
  }
-}
+}
--- a/examples/nested-jsbeautifyrc/less/original/_test2.less
+++ b/examples/nested-jsbeautifyrc/less/original/_test2.less
--- a/examples/nested-jsbeautifyrc/less/original/_test3.less
+++ b/examples/nested-jsbeautifyrc/less/original/_test3.less
--- a/examples/nested-jsbeautifyrc/sass/expected/alphasort1.scss
+++ b/examples/nested-jsbeautifyrc/sass/expected/alphasort1.scss
@ -1,6 +1,4 @@
 .example() {
-  .base-apple();
-  // Sets base apple color to red
-  .apple-color(@color-green);
-  // Sets apple color to green
-}
+  .apple-color(@color-green); // Sets apple color to green
+  .base-apple(); // Sets base apple color to red
+}
--- a/examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss
+++ b/examples/nested-jsbeautifyrc/sass/expected/interpolated-text-vars.scss
@ -5,4 +5,4 @@
  a#{$parent}:hover {
    color: darken($color, 10%);
  }
-}
+}
--- a/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss
+++ b/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss
@ -1,5 +1,6 @@
 /* kendo UI */
@import "variables";
+
 // slider
 .k-slider-track {
  background-color: $gray-light;
--- a/examples/nested-jsbeautifyrc/sass/expected/test.sass
+++ b/examples/nested-jsbeautifyrc/sass/expected/test.sass
@ -3,4 +3,4 @@ a {
  &:hover {
    color: blue;
  }
-}
+}
--- a/examples/nested-jsbeautifyrc/sass/expected/test.scss
+++ b/examples/nested-jsbeautifyrc/sass/expected/test.scss
@ -2,11 +2,13 @@
  .container {
    .cta--primary {
      &:visited {
+        
        //whatever
      }
      &::before {
+        
        //whatever
      }
    }
  }
-}
+}
--- a/examples/nested-jsbeautifyrc/sass/original/_kendo_ui.scss
+++ b/examples/nested-jsbeautifyrc/sass/original/_kendo_ui.scss
--- a/examples/nested-jsbeautifyrc/sass/original/_test.scss
+++ b/examples/nested-jsbeautifyrc/sass/original/_test.scss
--- a/examples/simple-jsbeautifyrc/javascript/expected/test.json
+++ b/examples/simple-jsbeautifyrc/javascript/expected/test.json
@ -7,6 +7,5 @@
  "preserve_newlines": true,
  "max_preserve_newlines": 2,
  /* test *
-    "jslint_happy": true
-  }
-  */
+  "jslint_happy": true
+}
--- a/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss
+++ b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss
@ -1,24 +1,28 @@
-"Window" :
-  { exitOnClose: true,
+"Window": {
+  exitOnClose: true,
  backgroundColor: "#fff",
  title: "Kochgut"
 }
-"Label" :
-  { width: Ti.UI.SIZE,
+
+"Label": {
+  width: Ti.UI.SIZE,
  height: Ti.UI.SIZE,
  color: "#555",
  touchEnabled: false
 }
-"Button" :
-  { backgroundColor: "#03a9f4",
+
+"Button": {
+  backgroundColor: "#03a9f4",
  color: "#fff",
  borderRadius: 2
 }
-"#menu" :
-  { backgroundImage: "/images/bg.png"
+
+"#menu": {
+  backgroundImage: "/images/bg.png"
 }
-".button" :
-  { backgroundColor: "#03a9f4",
+
+".button": {
+  backgroundColor: "#03a9f4",
  color: "#fff",
  borderRadius: 2,
  width: Ti.UI.SIZE,
@ -26,60 +30,68 @@
  top: 16,
  bottom: 16
 }
-".lbl_button" :
-  { left: 20,
+
+".lbl_button": {
+  left: 20,
  right: 20,
  color: "#fff"
 }
-".headline" :
-  { color: "#aaa",
+
+".headline": {
+  color: "#aaa",
  left: 16,
  height: 48,
  font: {
    fontWeight: "bold"
  }
 }
-".grid" :
-  { left: 2,
+
+".grid": {
+  left: 2,
  right: 2,
  layout: "horizontal",
  height: Ti.UI.SIZE
 }
-".card [platform=tablet]" :
-  { width: "33%",
+
+".card [platform=tablet]": {
+  width: "33%",
  height: 150,
  bottom: 2
 }
-".card" :
-  { width: "50%",
+
+".card": {
+  width: "50%",
  height: 150,
  bottom: 2
 }
-".padding" :
-  { right: 2,
+
+".padding": {
+  right: 2,
  left: 0,
  top: 0,
  bottom: 0,
  backgroundImage: "/images/essen.jpg"
 }
-".card_overlay" :
-  { bottom: 0,
+".card_overlay": {
+  bottom: 0,
  left: 0,
  right: 0,
  height: 48
 }
-".card_overlay_bg" :
-  { left: 0,
+
+".card_overlay_bg": {
+  left: 0,
  right: 0,
  bottom: 0,
  top: 0,
  backgroundColor: "#000",
  opacity: 0.3
 }
-".card_lbl" :
-  { color: "#fff",
+
+".card_lbl": {
+  color: "#fff",
  left: 16,
  font: {
    fontSize: 16
  }
-}
+}
--- a/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss
+++ b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss
@ -1,12 +1,12 @@
-".container" :
-  { backgroundImage: 'images/bgbg-builder.png',
+".container": {
+  backgroundImage: 'images/bgbg-builder.png',
  width: 1024,
  height: 752,
  top: 0,
  left: 0
 },
-"#blackArrow" :
-  { touchEnabled: false,
+"#blackArrow": {
+  touchEnabled: false,
  backgroundImage: 'images/arrow-builder.png',
  width: 15,
  height: 10,
--- a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page-using-detail.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page-using-detail.page
@ -1,3 +1,5 @@
 <apex:page standardController="Contact">
+
  <apex:detail/>
+
 </apex:page>
--- a/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/basic-page.page
@ -1,3 +1,5 @@
 <apex:page standardController="Contact">
+
  <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
+
 </apex:page>
--- a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-inputfield.page
@ -1,6 +1,8 @@
 <apex:page standardController="Contact">
+
  <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
-  <apex:form>
+
+  <apex:form >
    <apex:pageBlock title="Contact">
      <apex:pageBlockSection title="Editing">
        <apex:inputfield value="{!contact.firstname}"/>
@ -11,4 +13,5 @@
      </apex:pageBlockSection>
    </apex:pageBlock>
  </apex:form>
+
 </apex:page>
--- a/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page
+++ b/examples/simple-jsbeautifyrc/visualforce/expected/page-with-outputfield.page
@ -1,5 +1,7 @@
 <apex:page standardController="Contact">
+
  <apex:sectionHeader subtitle="{!contact.account.name}" title="{!contact.firstname}"/>
+
  <apex:pageBlock title="Contact">
    <apex:pageBlockSection title="Details">
      <apex:outputfield value="{!contact.firstname}"/>
@ -8,4 +10,5 @@
      <apex:outputfield value="{!contact.birthdate}"/>
    </apex:pageBlockSection>
  </apex:pageBlock>
+
 </apex:page>
--- a/package.json
+++ b/package.json
@ -56,7 +56,7 @@
    "async": "^1.2.1",
    "atom-message-panel": "^1.2.4",
    "atom-space-pen-views": "^2.0.5",
-    "bluebird": "^2.9.27",
+    "bluebird": "^2.9.30",
    "coffee-fmt": "0.11.0",
    "coffee-formatter": "^0.1.2",
    "cross-spawn": "^0.4.1",
@ -68,12 +68,12 @@
    "expand-home-dir": "0.0.2",
    "extend": "^2.0.1",
    "handlebars": "^3.0.3",
-    "js-beautify": "^1.5.6",
+    "js-beautify": "^1.5.7",
    "lodash": "3.9.3",
    "loophole": "^1.0.0",
    "node-dir": "^0.1.8",
    "node-uuid": "^1.4.3",
-    "prettydiff": "^1.11.21",
+    "prettydiff": "^1.12.8",
    "space-pen": "^5.1.1",
    "strip-json-comments": "^1.0.2",
    "temp": "^0.8.3",