ad20b1a · unity8 · git.iko.soy

plugins/Dash/CardCreator.js−1

compare with xenial

unifiedsplit

@@ -277,7 +277,6 @@ var kSubtitleLabelCode = 'Label { \n\

277var kAttributesRowCode = 'CardAttributesGrid { \n\

278 id: attributesRow; \n\

279 objectName: "attributesRow"; \n\

280− height: units.gu(1.5); \n\

281 anchors { %1 } \n\

280 anchors { %1 } \n\

282 model: cardData["attributes"] \n\

281 model: cardData["attributes"] \n\

283 }\n';

282 }\n';

tests/plugins/Dash/tst_CardAttributesGrid.qml+2−2

@@ -23,8 +23,8 @@ Item {

23 height: units.gu(30)

24

25 property var testData: [

26− [{"value":"text1"},{"value":"text2"}],

26+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}],

27− [{"value":"text1"},{"value":"text2"},{"value":"text3"}]

27+ [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"},{"value":"text3"}]

28 ]

29

30 CardAttributesGrid {

tests/qmltests/Dash/tst_Card.qml+1−1

@@ -34,7 +34,7 @@ Rectangle {

34 "title": "foo",

35 "subtitle": "bar",

36 "summary": "Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.",

37− "attributes": [{"value":"text1"},{"value":"text2"}]

37+ "attributes": [{"value":"text1","icon":"image://theme/ok"},{"value":"text2","icon":"image://theme/cancel"}]

38 }'

39

40 property var cardsModel: [