From bb91eab9553f36db1441289ff3af1ce8ca57428f Mon Sep 17 00:00:00 2001 From: Glavin Wiechert Date: Thu, 10 Dec 2015 21:41:35 -0400 Subject: [PATCH] Upgrade Pretty Diff to v1.16.0 and fix failing tests --- .../less/expected/test.less | 3 ++ .../less/expected/test2.less | 25 ++++++++++++++++- .../less/expected/test3.less | 14 ++-------- .../less/expected/test4.less | 2 ++ .../sass/expected/kendo_ui.scss | 4 +-- .../sass/expected/test.scss | 2 -- .../nested-jsbeautifyrc/xml/expected/test.xml | 4 ++- .../expected/random_indent.tss | 28 +++++++++---------- .../titanium-style-sheets/expected/test2.tss | 4 +-- package.json | 2 +- 10 files changed, 54 insertions(+), 34 deletions(-) diff --git a/examples/nested-jsbeautifyrc/less/expected/test.less b/examples/nested-jsbeautifyrc/less/expected/test.less index 4470dbd..1f603cd 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test.less +++ b/examples/nested-jsbeautifyrc/less/expected/test.less @@ -11,15 +11,18 @@ a { text-decoration: none; } &:visited { + color: @white; } &:hover { + color: @orange; } &.green { color: @green; &:hover { color: @white; + background-color: @green; } } diff --git a/examples/nested-jsbeautifyrc/less/expected/test2.less b/examples/nested-jsbeautifyrc/less/expected/test2.less index f5badc5..7e02e07 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test2.less +++ b/examples/nested-jsbeautifyrc/less/expected/test2.less @@ -1,6 +1,7 @@ // main: style.less @import (reference)"variables.less"; @import (reference)"mixins.less"; + .modal { position: fixed; height: 100%; @@ -9,6 +10,7 @@ z-index: 10; opacity: 0; display: none; + .innerModal { margin: auto; background-color: @white; @@ -18,6 +20,7 @@ -ms-transform: translateY(-100%); -o-transform: translateY(-100%); transform: translateY(-100%); + .fa { float: right; color: @white; @@ -33,6 +36,7 @@ } } } + &.modal-2text { .innerModal { width: @container-width; @@ -41,9 +45,11 @@ padding: 10px 25px; background-color: gainsboro; border-radius: 4px; + h2 { margin: 0 0 7px; } + div { height: 70%; overflow-y: scroll; @@ -51,27 +57,30 @@ padding: 15px; border-radius: 4px; } + .large-cta { margin-top: 25px; } } } } + #modal-video { .innerModal { left: 10%; margin-top: 30px; width: 1000px; background-color: lighten(@black, 25%); + iframe { width: 600px; height: 340px; margin: 2% auto; } - //container > div { text-align: center; + a { .styleLinks(@white, darken(@white, 10%)); padding: 5px; @@ -83,58 +92,72 @@ background-color: fade(@white, 30%); } } + h3 { color: @white; font-size: 3em; margin: 20px auto; } + button { margin-bottom: 50px; } } } } + .slideIn { .animation(SlideIn, 0.5s); } + @-webkit-keyframes SlideIn { 0% { .transform(translateY(-100%)); } + 100% { .transform(translateY(0px)); } } + .fadeIn { display: block; .animation(FadeIn, 0.5s); } + @-webkit-keyframes FadeIn { 0% { opacity: 0; } + 100% { opacity: 1; } } + .slideOut { .animation(SlideOut, 0.5s); } + @-webkit-keyframes SlideOut { 0% { .transform(translateY(0%)); } + 100% { .transform(translateY(-100%)); } } + .fadeOut { .animation(FadeOut, 0.5s); } + @-webkit-keyframes FadeOut { 0% { opacity: 1; } + 100% { opacity: 0; display: none; diff --git a/examples/nested-jsbeautifyrc/less/expected/test3.less b/examples/nested-jsbeautifyrc/less/expected/test3.less index 9e74f15..8952106 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test3.less +++ b/examples/nested-jsbeautifyrc/less/expected/test3.less @@ -1,14 +1,6 @@ // Breaks (fixed now) -.mixin(@variable, @anotherVariable) { - -} - +.mixin(@variable, @anotherVariable) {} // Works -.mixin(@variable; @anotherVariable) { - -} - +.mixin(@variable; @anotherVariable) {} // Ok -.mixin(@variable) { - -} +.mixin(@variable) {} diff --git a/examples/nested-jsbeautifyrc/less/expected/test4.less b/examples/nested-jsbeautifyrc/less/expected/test4.less index 49cc128..f901b7e 100644 --- a/examples/nested-jsbeautifyrc/less/expected/test4.less +++ b/examples/nested-jsbeautifyrc/less/expected/test4.less @@ -2,6 +2,7 @@ section#photo-details { width: 1140px; margin: 60px auto 70px; } + div.photo-view { text-align: center; figure { @@ -13,4 +14,5 @@ div.photo-view { display: block; } } + } diff --git a/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss b/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss index 8ce6390..c62bdcc 100644 --- a/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss +++ b/examples/nested-jsbeautifyrc/sass/expected/kendo_ui.scss @@ -1,6 +1,6 @@ /* kendo UI */ -@import "variables"; +@import "variables"; // slider .k-slider-track { background-color: $gray-light; @@ -18,4 +18,4 @@ background-color: $brand-primary; color: #fff; } -} \ No newline at end of file +} diff --git a/examples/nested-jsbeautifyrc/sass/expected/test.scss b/examples/nested-jsbeautifyrc/sass/expected/test.scss index 8435874..6b6bd67 100644 --- a/examples/nested-jsbeautifyrc/sass/expected/test.scss +++ b/examples/nested-jsbeautifyrc/sass/expected/test.scss @@ -2,11 +2,9 @@ .container { .cta--primary { &:visited { - //whatever } &::before { - //whatever } } diff --git a/examples/nested-jsbeautifyrc/xml/expected/test.xml b/examples/nested-jsbeautifyrc/xml/expected/test.xml index 02e8986..bf4738f 100644 --- a/examples/nested-jsbeautifyrc/xml/expected/test.xml +++ b/examples/nested-jsbeautifyrc/xml/expected/test.xml @@ -1,5 +1,7 @@ - ">]> + "> +]> diff --git a/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss index d0d5534..fc802dc 100644 --- a/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss +++ b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/random_indent.tss @@ -1,27 +1,27 @@ -"Window" : { +"Window": { exitOnClose: true, backgroundColor: "#fff", title: "Kochgut" } -"Label" : { +"Label": { width: Ti.UI.SIZE, height: Ti.UI.SIZE, color: "#555", touchEnabled: false } -"Button" : { +"Button": { backgroundColor: "#03a9f4", color: "#fff", borderRadius: 2 } -"#menu" : { +"#menu": { backgroundImage: "/images/bg.png" } -".button" : { +".button": { backgroundColor: "#03a9f4", color: "#fff", borderRadius: 2, @@ -31,13 +31,13 @@ bottom: 16 } -".lbl_button" : { +".lbl_button": { left: 20, right: 20, color: "#fff" } -".headline" : { +".headline": { color: "#aaa", left: 16, height: 48, @@ -46,40 +46,40 @@ } } -".grid" : { +".grid": { left: 2, right: 2, layout: "horizontal", height: Ti.UI.SIZE } -".card [platform=tablet]" : { +".card [platform=tablet]": { width: "33%", height: 150, bottom: 2 } -".card" : { +".card": { width: "50%", height: 150, bottom: 2 } -".padding" : { +".padding": { right: 2, left: 0, top: 0, bottom: 0, backgroundImage: "/images/essen.jpg" } -".card_overlay" : { +".card_overlay": { bottom: 0, left: 0, right: 0, height: 48 } -".card_overlay_bg" : { +".card_overlay_bg": { left: 0, right: 0, bottom: 0, @@ -88,7 +88,7 @@ opacity: 0.3 } -".card_lbl" : { +".card_lbl": { color: "#fff", left: 16, font: { diff --git a/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss index f8b82d0..93ab172 100644 --- a/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss +++ b/examples/simple-jsbeautifyrc/titanium-style-sheets/expected/test2.tss @@ -1,11 +1,11 @@ -".container" : { +".container": { backgroundImage: 'images/bgbg-builder.png', width: 1024, height: 752, top: 0, left: 0 }, -"#blackArrow" : { +"#blackArrow": { touchEnabled: false, backgroundImage: 'images/arrow-builder.png', width: 15, diff --git a/package.json b/package.json index 426fb76..db82a52 100644 --- a/package.json +++ b/package.json @@ -86,7 +86,7 @@ "loophole": "^1.0.0", "node-dir": "^0.1.8", "node-uuid": "^1.4.3", - "prettydiff": "^1.15.16", + "prettydiff": "^1.16.0", "season": "^5.3.0", "space-pen": "^5.1.1", "strip-json-comments": "^1.0.2",