git.iko.soy/unity8
on xenial help sign in
Remove || false;
a47644aAlbert Astals Cid
plugins/Dash/CardCreator.js+1−1
compare with xenial
unifiedsplit
@@ -71,7 +71,7 @@ var kArtShapeHolderCode = 'Item { \n\
71 id: artShapeLoader; \n\
71 id: artShapeLoader; \n\
72 objectName: "artShapeLoader"; \n\
72 objectName: "artShapeLoader"; \n\
73 readonly property string cardArt: cardData && cardData["art"] || "%4"; \n\
73 readonly property string cardArt: cardData && cardData["art"] || "%4"; \n\
74− active: cardArt != "" || false; \n\
74+ active: cardArt != ""; \n\
75 asynchronous: root.asynchronous; \n\
75 asynchronous: root.asynchronous; \n\
76 visible: status == Loader.Ready; \n\
76 visible: status == Loader.Ready; \n\
77 sourceComponent: Item { \n\
77 sourceComponent: Item { \n\
tests/plugins/Dash/cardcreator/1.res+3−2
@@ -24,7 +24,8 @@ Item {
24 Loader {
24 Loader {
25 id: artShapeLoader;
25 id: artShapeLoader;
26 objectName: "artShapeLoader";
26 objectName: "artShapeLoader";
27− active: cardData && cardData["art"] || false;
27+ readonly property string cardArt: cardData && cardData["art"] || "";
28+ active: cardArt != "";
28 asynchronous: root.asynchronous;
29 asynchronous: root.asynchronous;
29 visible: status == Loader.Ready;
30 visible: status == Loader.Ready;
30 sourceComponent: Item {
31 sourceComponent: Item {
@@ -82,7 +83,7 @@ Item {
82 CroppedImageMinimumSourceSize {
83 CroppedImageMinimumSourceSize {
83 id: artImage;
84 id: artImage;
84 objectName: "artImage";
85 objectName: "artImage";
85− source: cardData && cardData["art"] || "";
86+ source: artShapeLoader.cardArt;
86 asynchronous: root.asynchronous;
87 asynchronous: root.asynchronous;
87 width: root.width;
88 width: root.width;
88 height: width / artShape.aspect;
89 height: width / artShape.aspect;
tests/plugins/Dash/cardcreator/3.res+3−2
@@ -24,7 +24,8 @@ Item {
24 Loader {
24 Loader {
25 id: artShapeLoader;
25 id: artShapeLoader;
26 objectName: "artShapeLoader";
26 objectName: "artShapeLoader";
27− active: cardData && cardData["art"] || false;
27+ readonly property string cardArt: cardData && cardData["art"] || "";
28+ active: cardArt != "";
28 asynchronous: root.asynchronous;
29 asynchronous: root.asynchronous;
29 visible: status == Loader.Ready;
30 visible: status == Loader.Ready;
30 sourceComponent: Item {
31 sourceComponent: Item {
@@ -82,7 +83,7 @@ Item {
82 CroppedImageMinimumSourceSize {
83 CroppedImageMinimumSourceSize {
83 id: artImage;
84 id: artImage;
84 objectName: "artImage";
85 objectName: "artImage";
85− source: cardData && cardData["art"] || "";
86+ source: artShapeLoader.cardArt;
86 asynchronous: root.asynchronous;
87 asynchronous: root.asynchronous;
87 width: root.width;
88 width: root.width;
88 height: width / artShape.aspect;
89 height: width / artShape.aspect;
tests/plugins/Dash/cardcreator/5.res+3−2
@@ -24,7 +24,8 @@ Item {
24 Loader {
24 Loader {
25 id: artShapeLoader;
25 id: artShapeLoader;
26 objectName: "artShapeLoader";
26 objectName: "artShapeLoader";
27− active: cardData && cardData["art"] || false;
27+ readonly property string cardArt: cardData && cardData["art"] || "";
28+ active: cardArt != "";
28 asynchronous: root.asynchronous;
29 asynchronous: root.asynchronous;
29 visible: status == Loader.Ready;
30 visible: status == Loader.Ready;
30 sourceComponent: Item {
31 sourceComponent: Item {
@@ -82,7 +83,7 @@ Item {
82 CroppedImageMinimumSourceSize {
83 CroppedImageMinimumSourceSize {
83 id: artImage;
84 id: artImage;
84 objectName: "artImage";
85 objectName: "artImage";
85− source: cardData && cardData["art"] || "";
86+ source: artShapeLoader.cardArt;
86 asynchronous: root.asynchronous;
87 asynchronous: root.asynchronous;
87 width: root.width;
88 width: root.width;
88 height: width / artShape.aspect;
89 height: width / artShape.aspect;