81a3d3b · unity8 · git.iko.soy

git.iko.soy/unity8

on xenial help sign in

playlist is not an url, it's an array

81a3d3bAlbert Astals Cid11 years ago

plugins/Dash/CardCreator.js+1−1

compare with xenial

unifiedsplit

@@ -119,7 +119,6 @@ var kAudioButtonCode = 'AbstractButton { \n\

119 width: %2; \n\

120 height: %3; \n\

121 readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || ""; \n\

122− readonly property url playlist: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null; \n\

123 UbuntuShape { \n\

122 UbuntuShape { \n\

124 anchors.fill: parent; \n\

123 anchors.fill: parent; \n\

125 visible: parent.pressed; \n\

124 visible: parent.pressed; \n\

@@ -140,6 +139,7 @@ var kAudioButtonCode = 'AbstractButton { \n\

140 DashAudioPlayer.play(); \n\

139 DashAudioPlayer.play(); \n\

141 } \n\

140 } \n\

142 } else { \n\

141 } else { \n\

142+ var playlist = (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null; \n\

143 DashAudioPlayer.playSource(source, playlist); \n\

144 } \n\

145 } \n\

tests/plugins/Dash/cardcreator/9.res+2−2

@@ -74,8 +74,7 @@ CardAudioProgress {

74 width: height;

75 height: (root.fixedHeaderHeight > 0 ? root.fixedHeaderHeight : headerHeight) + 2 * units.gu(1);

76 readonly property url source: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["uri"]) || "";

77− readonly property url playlist: (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null;

78− UbuntuShape {

77+ UbuntuShape {

79 anchors.fill: parent;

78 anchors.fill: parent;

80 visible: parent.pressed;

79 visible: parent.pressed;

81 radius: "medium";

80 radius: "medium";

@@ -95,6 +94,7 @@ CardAudioProgress {

95 DashAudioPlayer.play();

94 DashAudioPlayer.play();

96 }

95 }

97 } else {

96 } else {

97+ var playlist = (cardData["quickPreviewData"] && cardData["quickPreviewData"]["playlist"]) || null;

98 DashAudioPlayer.playSource(source, playlist);

99 }

100 }