@@ -25,7 +25,7 @@ var kBackgroundLoaderCode = 'Loader {\n\
2525 objectName: "backgroundLoader"; \n\
2626 anchors.fill: parent; \n\
2727 asynchronous: %3; \n\
28− visible: status == Loader.Ready; \n\
28+ visible: status === Loader.Ready; \n\
2929 sourceComponent: UbuntuShape { \n\
3030 objectName: "background"; \n\
3131 radius: "medium"; \n\
@@ -75,7 +75,7 @@ var kArtProportionalShapeCode = 'ProportionalShape { \n\
7575 aspect: UbuntuShape.DropShadow; \n\
7676 }';
7777
78−// %1 is used as anchors of artShapeHolder
78+// %1 is used as anchors of artShapeLoader
7979// %2 is used as image width
8080// %3 is used as image height
8181// %4 is whether the image should be visible
@@ -83,42 +83,39 @@ var kArtProportionalShapeCode = 'ProportionalShape { \n\
8383// %6 is the shape code we want to use
8484// %7 is injected as code to artImage
8585// %8 is used as image fallback
86−var kArtShapeHolderCode = 'Item { \n\
87− id: artShapeHolder; \n\
86+var kArtShapeHolderCode = 'Loader { \n\
87+ id: artShapeLoader; \n\
8888 height: root.fixedArtShapeSize.height; \n\
8989 width: root.fixedArtShapeSize.width; \n\
9090 anchors { %1 } \n\
91− Loader { \n\
92− id: artShapeLoader; \n\
93− objectName: "artShapeLoader"; \n\
94− readonly property string cardArt: cardData && cardData["art"] || %8; \n\
95− onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
96− active: cardArt != ""; \n\
97− asynchronous: %5; \n\
98− visible: status == Loader.Ready; \n\
99− sourceComponent: Item { \n\
100− id: artShape; \n\
101− objectName: "artShape"; \n\
102− visible: image.status == Image.Ready; \n\
103− readonly property alias image: artImage; \n\
104− %6 \n\
105− width: root.fixedArtShapeSize.width; \n\
106− height: root.fixedArtShapeSize.height; \n\
107− CroppedImageMinimumSourceSize { \n\
108− id: artImage; \n\
109− objectName: "artImage"; \n\
110− source: artShapeLoader.cardArt; \n\
111− asynchronous: %5; \n\
112− visible: %4; \n\
113− width: %2; \n\
114− height: %3; \n\
115− %7 \n\
116− } \n\
91+ objectName: "artShapeLoader"; \n\
92+ readonly property string cardArt: cardData && cardData["art"] || %8; \n\
93+ onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
94+ active: cardArt != ""; \n\
95+ asynchronous: %5; \n\
96+ visible: status === Loader.Ready; \n\
97+ sourceComponent: Item { \n\
98+ id: artShape; \n\
99+ objectName: "artShape"; \n\
100+ visible: image.status === Image.Ready; \n\
101+ readonly property alias image: artImage; \n\
102+ %6 \n\
103+ width: root.fixedArtShapeSize.width; \n\
104+ height: root.fixedArtShapeSize.height; \n\
105+ CroppedImageMinimumSourceSize { \n\
106+ id: artImage; \n\
107+ objectName: "artImage"; \n\
108+ source: artShapeLoader.cardArt; \n\
109+ asynchronous: %5; \n\
110+ visible: %4; \n\
111+ width: %2; \n\
112+ height: %3; \n\
113+ %7 \n\
117114 } \n\
118115 } \n\
119116 }\n';
120117
121−// %1 is used as anchors of artShapeHolder
118+// %1 is used as anchors of artShapeLoader
122119// %2 is used as image width
123120// %3 is used as image height
124121// %4 is whether the image should be visible
@@ -126,37 +123,32 @@ var kArtShapeHolderCode = 'Item { \n\
126123// %6 is the shape code we want to use
127124// %7 is injected as code to artImage
128125// %8 is used as image fallback
129−var kArtShapeHolderCodeCardToolCard = 'Item { \n\
130− id: artShapeHolder; \n\
131− height: artShapeLoader.height; \n\
132− width: artShapeLoader.width; \n\
126+var kArtShapeHolderCodeCardToolCard = 'Loader { \n\
127+ id: artShapeLoader; \n\
133128 anchors { %1 } \n\
134− Loader { \n\
135− id: artShapeLoader; \n\
136− objectName: "artShapeLoader"; \n\
137− readonly property string cardArt: cardData && cardData["art"] || %8; \n\
138− onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
139− active: cardArt != ""; \n\
140− asynchronous: %5; \n\
141− visible: status == Loader.Ready; \n\
142− sourceComponent: Item { \n\
143− id: artShape; \n\
144− objectName: "artShape"; \n\
145− visible: image.status == Image.Ready; \n\
146− readonly property alias image: artImage; \n\
147− %6 \n\
148− width: image.status !== Image.Ready ? 0 : image.width; \n\
149− height: image.status !== Image.Ready ? 0 : image.height; \n\
150− CroppedImageMinimumSourceSize { \n\
151− id: artImage; \n\
152− objectName: "artImage"; \n\
153− source: artShapeLoader.cardArt; \n\
154− asynchronous: %5; \n\
155− visible: %4; \n\
156− width: %2; \n\
157− height: %3; \n\
158− %7 \n\
159− } \n\
129+ objectName: "artShapeLoader"; \n\
130+ readonly property string cardArt: cardData && cardData["art"] || %8; \n\
131+ onCardArtChanged: { if (item) { item.image.source = cardArt; } } \n\
132+ active: cardArt != ""; \n\
133+ asynchronous: %5; \n\
134+ visible: status === Loader.Ready; \n\
135+ sourceComponent: Item { \n\
136+ id: artShape; \n\
137+ objectName: "artShape"; \n\
138+ visible: image.status === Image.Ready; \n\
139+ readonly property alias image: artImage; \n\
140+ %6 \n\
141+ width: image.status !== Image.Ready ? 0 : image.width; \n\
142+ height: image.status !== Image.Ready ? 0 : image.height; \n\
143+ CroppedImageMinimumSourceSize { \n\
144+ id: artImage; \n\
145+ objectName: "artImage"; \n\
146+ source: artShapeLoader.cardArt; \n\
147+ asynchronous: %5; \n\
148+ visible: %4; \n\
149+ width: %2; \n\
150+ height: %3; \n\
151+ %7 \n\
160152 } \n\
161153 } \n\
162154 }\n';
@@ -214,10 +206,10 @@ var kAudioButtonCode = 'AbstractButton { \n\
214206var kOverlayLoaderCode = 'Loader { \n\
215207 id: overlayLoader; \n\
216208 readonly property real overlayHeight: %2 + units.gu(2); \n\
217− anchors.fill: artShapeHolder; \n\
209+ anchors.fill: artShapeLoader; \n\
218210 active: artShapeLoader.active && artShapeLoader.item && artShapeLoader.item.image.status === Image.Ready || false; \n\
219211 asynchronous: %1; \n\
220− visible: showHeader && status == Loader.Ready; \n\
212+ visible: showHeader && status === Loader.Ready; \n\
221213 sourceComponent: UbuntuShapeOverlay { \n\
222214 id: overlay; \n\
223215 property real luminance: Style.luminance(overlayColor); \n\
@@ -274,7 +266,7 @@ var kMascotShapeLoaderCode = 'Loader { \n\
274266 objectName: "mascotShapeLoader"; \n\
275267 asynchronous: %2; \n\
276268 active: mascotImage.status === Image.Ready; \n\
277− visible: showHeader && active && status == Loader.Ready; \n\
269+ visible: showHeader && active && status === Loader.Ready; \n\
278270 width: units.gu(6); \n\
279271 height: units.gu(5.625); \n\
280272 sourceComponent: UbuntuShape { image: mascotImage } \n\
@@ -596,15 +588,15 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
596588
597589 var headerVerticalAnchors;
598590 if (headerAsOverlay) {
599− headerVerticalAnchors = 'bottom: artShapeHolder.bottom; \n\
591+ headerVerticalAnchors = 'bottom: artShapeLoader.bottom; \n\
600592 bottomMargin: units.gu(1);\n';
601593 } else {
602594 if (hasArt) {
603595 if (isHorizontal) {
604− headerVerticalAnchors = 'top: artShapeHolder.top; \n\
596+ headerVerticalAnchors = 'top: artShapeLoader.top; \n\
605597 topMargin: units.gu(1);\n';
606598 } else {
607− headerVerticalAnchors = 'top: artShapeHolder.bottom; \n\
599+ headerVerticalAnchors = 'top: artShapeLoader.bottom; \n\
608600 topMargin: units.gu(1);\n';
609601 }
610602 } else {
@@ -616,7 +608,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
616608 var headerLeftAnchor;
617609 var headerLeftAnchorHasMargin = false;
618610 if (isHorizontal && hasArt) {
619− headerLeftAnchor = 'left: artShapeHolder.right; \n\
611+ headerLeftAnchor = 'left: artShapeLoader.right; \n\
620612 leftMargin: units.gu(1);\n';
621613 headerLeftAnchorHasMargin = true;
622614 } else if (isHorizontal && isAudio) {
@@ -870,7 +862,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
870862 var audioButtonWidth;
871863 var audioButtonHeight;
872864 if (hasArt) {
873− audioButtonAnchorsFill = 'artShapeHolder';
865+ audioButtonAnchorsFill = 'artShapeLoader';
874866 audioButtonWidth = 'undefined';
875867 audioButtonHeight = 'undefined';
876868 } else {
@@ -884,15 +876,15 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
884876
885877 if (hasSummary) {
886878 var summaryTopAnchor;
887− if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
888− else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
879+ if (isHorizontal && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';
880+ else if (headerAsOverlay && hasArt) summaryTopAnchor = 'artShapeLoader.bottom';
889881 else if (hasHeaderRow) summaryTopAnchor = 'row.bottom';
890882 else if (hasTitleContainer) summaryTopAnchor = 'headerTitleContainer.bottom';
891883 else if (hasMascot) summaryTopAnchor = 'mascotImage.bottom';
892884 else if (hasAttributes) summaryTopAnchor = 'attributesRow.bottom';
893885 else if (hasSubtitle) summaryTopAnchor = 'subtitleLabel.bottom';
894886 else if (hasTitle) summaryTopAnchor = 'titleLabel.bottom';
895− else if (hasArt) summaryTopAnchor = 'artShapeHolder.bottom';
887+ else if (hasArt) summaryTopAnchor = 'artShapeLoader.bottom';
896888 else summaryTopAnchor = 'parent.top';
897889
898890 var summaryColor;
@@ -912,15 +904,15 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
912904 var socialTopAnchor;
913905
914906 if (hasSummary) socialTopAnchor = 'summary.bottom;';
915− else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
916− else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
907+ else if (isHorizontal && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';
908+ else if (headerAsOverlay && hasArt) socialTopAnchor = 'artShapeLoader.bottom;';
917909 else if (hasHeaderRow) socialTopAnchor = 'row.bottom;';
918910 else if (hasTitleContainer) socialTopAnchor = 'headerTitleContainer.bottom;';
919911 else if (hasMascot) socialTopAnchor = 'mascotImage.bottom;';
920912 else if (hasAttributes) socialTopAnchor = 'attributesRow.bottom;';
921913 else if (hasSubtitle) socialTopAnchor = 'subtitleLabel.bottom;';
922914 else if (hasTitle) socialTopAnchor = 'titleLabel.bottom;';
923− else if (hasArt) socialTopAnchor = 'artShapeHolder.bottom;';
915+ else if (hasArt) socialTopAnchor = 'artShapeLoader.bottom;';
924916 else socialTopAnchor = 'parent.top';
925917
926918 socialAnchors = 'top: ' + socialTopAnchor + ' left: parent.left; right: parent.right; topMargin: units.gu(1);'
@@ -940,7 +932,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
940932 if (hasBackground) {
941933 touchdownAnchors = 'fill: backgroundLoader';
942934 } else if (touchdownOnArtShape) {
943− touchdownAnchors = 'fill: artShapeHolder';
935+ touchdownAnchors = 'fill: artShapeLoader';
944936 } else {
945937 touchdownAnchors = 'fill: root'
946938 }
@@ -956,7 +948,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
956948 } else if (isAudio) {
957949 implicitHeight += 'audioButton.height;\n';
958950 } else if (headerAsOverlay) {
959− implicitHeight += 'artShapeHolder.height;\n';
951+ implicitHeight += 'artShapeLoader.height;\n';
960952 } else if (hasHeaderRow) {
961953 implicitHeight += 'row.y + row.height + units.gu(1);\n';
962954 } else if (hasMascot) {
@@ -970,7 +962,7 @@ function cardString(template, components, isCardTool, artShapeStyle, categoryLay
970962 } else if (hasTitle) {
971963 implicitHeight += 'titleLabel.y + titleLabel.height + units.gu(1);\n';
972964 } else if (hasArt) {
973− implicitHeight += 'artShapeHolder.height;\n';
965+ implicitHeight += 'artShapeLoader.height;\n';
974966 } else {
975967 implicitHeight = '';
976968 }