From 9a3a23fc2af9c6f93d9200c178047d975d344773 Mon Sep 17 00:00:00 2001 From: Glavin Wiechert Date: Mon, 2 Nov 2015 14:00:15 -0400 Subject: [PATCH] Update Pretty Diff to v1.15.7 and fix broken JSX and TSS tests --- .../simple-jsbeautifyrc/jsx/expected/test.jsx | 3 +- .../expected/random_indent.tss | 28 +++++++++---------- .../titanium-style-sheets/expected/test2.tss | 4 +-- package.json | 2 +- 4 files changed, 18 insertions(+), 19 deletions(-) diff --git a/examples/simple-jsbeautifyrc/jsx/expected/test.jsx b/examples/simple-jsbeautifyrc/jsx/expected/test.jsx index 7026b76..f733d2f 100644 --- a/examples/simple-jsbeautifyrc/jsx/expected/test.jsx +++ b/examples/simple-jsbeautifyrc/jsx/expected/test.jsx @@ -1,5 +1,4 @@ -var Mist = React.createClass({ - renderList: function() { +var Mist = React.createClass({renderList: function() { return this .props .items 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 fc802dc..d0d5534 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 93ab172..f8b82d0 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 91ce8a8..23b8f67 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.12.19", + "prettydiff": "^1.15.7", "season": "^5.3.0", "space-pen": "^5.1.1", "strip-json-comments": "^1.0.2",