Merge lp:~unity-team/unity8/ota9.5 into lp:unity8/stable

[Michał Sawicz]

[r2175] LVWPH: Reset to initial values when list is empty
[r2166] Better attempt at sanitization
[r2162] Do not use the same filepath parameter for all the card creator createQmlObject calls

[Michał Sawicz (saviq)]

Verified the diff is sane for the cherry-picks.

review: Approve (code)

=== modified file 'plugins/Dash/CardCreator.js'
--- plugins/Dash/CardCreator.js	2016-01-21 22:33:46 +0000
+++ plugins/Dash/CardCreator.js	2016-02-11 14:27:32 +0000
@@ -16,9 +16,9 @@
 
 .pragma library
 
-// %1 is the template["card-background"] string
-// %2 is the template["card-background"]["elements"][0]
-// %3 is the template["card-background"]["elements"][1]
+// %1 is the template["card-background"]["elements"][0]
+// %2 is the template["card-background"]["elements"][1]
+// %3 is the template["card-background"] string
 var kBackgroundLoaderCode = 'Loader {\n\
                                 id: backgroundLoader; \n\
                                 objectName: "backgroundLoader"; \n\
@@ -46,14 +46,14 @@
                                         objectName: "backgroundImage"; \n\
                                         source: { \n\
                                             if (cardData && typeof cardData["background"] === "string") return cardData["background"]; \n\
-                                            else return "%1"; \n\
+                                            else return %3; \n\
                                         } \n\
                                     } \n\
                                     function getColor(index) { \n\
                                         if (cardData && typeof cardData["background"] === "object" \n\
                                             && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { \n\
                                             return cardData["background"]["elements"][index]; \n\
-                                        } else return index === 0 ? %2 : %3; \n\
+                                        } else return index === 0 ? %1 : %2; \n\
                                     } \n\
                                 } \n\
                             }\n';
@@ -373,27 +373,21 @@
                             color: %3; \n\
                          }';
 
-function evil_param(object) {
-    for (var x in object) {
-        if (typeof object[x] === "object" && evil_param(object[x]))
-            return true;
-
-        if (typeof object[x] === "string" && object[x].match(/"(?:[^"\\]|\\.)*"/) != null)
-            return true;
+function sanitizeColor(colorString) {
+    if (colorString !== undefined) {
+        if (colorString.match(/^[#a-z0-9]*$/i) === null) {
+            // This is not the perfect regexp for color
+            // but what we're trying to do here is just protect
+            // against injection so it's ok
+            return "";
+        }
     }
-
-    return false;
+    return colorString;
 }
 
 function cardString(template, components) {
     var code;
 
-    if (evil_param(template))
-        return "";
-
-    if (evil_param(components))
-        return "";
-
     var templateInteractive = (template == null ? true : (template["non-interactive"] !== undefined ? !template["non-interactive"] : true)) ? "true" : "false";
 
     code = 'AbstractButton { \n\
@@ -442,18 +436,26 @@
     }
 
     if (hasBackground) {
-        var templateCardBackground = (template && typeof template["card-background"] === "string") ? template["card-background"] :  "";
+        var templateCardBackground;
+        if (template && typeof template["card-background"] === "string") {
+            templateCardBackground = 'decodeURI("' + encodeURI(template["card-background"]) + '")';
+        } else {
+            templateCardBackground = '""';
+        }
+
         var backgroundElements0;
         var backgroundElements1;
         if (template && typeof template["card-background"] === "object" && (template["card-background"]["type"] === "color" || template["card-background"]["type"] === "gradient"))  {
-            if (template["card-background"]["elements"][0] !== undefined) {
-                backgroundElements0 = '"%1"'.arg(template["card-background"]["elements"][0]);
+            var element0 = sanitizeColor(template["card-background"]["elements"][0]);
+            var element1 = sanitizeColor(template["card-background"]["elements"][1]);
+            if (element0 !== undefined) {
+                backgroundElements0 = '"%1"'.arg(element0);
             }
-            if (template["card-background"]["elements"][1] !== undefined) {
-                backgroundElements1 = '"%1"'.arg(template["card-background"]["elements"][1]);
+            if (element1 !== undefined) {
+                backgroundElements1 = '"%1"'.arg(element1);
             }
         }
-        code += kBackgroundLoaderCode.arg(templateCardBackground).arg(backgroundElements0).arg(backgroundElements1);
+        code += kBackgroundLoaderCode.arg(backgroundElements0).arg(backgroundElements1).arg(templateCardBackground);
     }
 
     if (hasArt) {
@@ -479,9 +481,10 @@
         }
 
         var fallback = components["art"] && components["art"]["fallback"] || "";
+        fallback = encodeURI(fallback);
         var fallbackCode = "";
         if (fallback !== "") {
-            fallbackCode += 'onStatusChanged: if (status === Image.Error) source = "%1";'.arg(fallback);
+            fallbackCode += 'onStatusChanged: if (status === Image.Error) source = decodeURI("%1");'.arg(fallback);
         }
         code += kArtShapeHolderCode.arg(artAnchors).arg(widthCode).arg(heightCode).arg(fallbackCode);
     } else {
@@ -576,9 +579,10 @@
 
         var mascotImageVisible = useMascotShape ? 'false' : 'showHeader';
         var fallback = components["mascot"] && components["mascot"]["fallback"] || "";
+        fallback = encodeURI(fallback);
         var fallbackCode = "";
         if (fallback !== "") {
-            fallbackCode += 'onStatusChanged: if (status === Image.Error) source = "%1";'.arg(fallback);
+            fallbackCode += 'onStatusChanged: if (status === Image.Error) source = decodeURI("%1");'.arg(fallback);
         }
         mascotCode = kMascotImageCode.arg(mascotAnchors).arg(mascotImageVisible).arg(fallbackCode);
     }
@@ -825,7 +829,7 @@
     return code;
 }
 
-function createCardComponent(parent, template, components) {
+function createCardComponent(parent, template, components, identifier) {
     var imports = 'import QtQuick 2.4; \n\
                    import Ubuntu.Components 1.3; \n\
                    import Ubuntu.Settings.Components 0.1; \n\
@@ -835,7 +839,7 @@
     var code = imports + 'Component {\n' + card + '}\n';
 
     try {
-        return Qt.createQmlObject(code, parent, "createCardComponent");
+        return Qt.createQmlObject(code, parent, identifier);
     } catch (e) {
         console.error("ERROR: Invalid component created.");
         console.error("Template:");
 
=== modified file 'plugins/Dash/CardCreatorCache.qml'
--- plugins/Dash/CardCreatorCache.qml	2015-07-15 15:07:19 +0000
+++ plugins/Dash/CardCreatorCache.qml	2016-02-11 14:27:32 +0000
@@ -32,7 +32,7 @@
         var allString = tString + cString;
         var component = cache[allString];
         if (component === undefined) {
-            component = CardCreator.createCardComponent(root, template, components);
+            component = CardCreator.createCardComponent(root, template, components, allString);
             cache[allString] = component;
         }
         return component;
 
=== modified file 'plugins/Dash/listviewwithpageheader.cpp'
--- plugins/Dash/listviewwithpageheader.cpp	2016-01-05 09:24:58 +0000
+++ plugins/Dash/listviewwithpageheader.cpp	2016-02-11 14:27:32 +0000
@@ -219,13 +219,7 @@
         Q_FOREACH(ListItem *item, m_visibleItems)
             releaseItem(item);
         m_visibleItems.clear();
-        m_firstVisibleIndex = -1;
-        adjustMinYExtent();
-        setContentY(0);
-        m_clipItem->setY(0);
-        if (m_topSectionItem) {
-            QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
-        }
+        initializeValuesForEmptyList();
 
         m_delegateModel->setDelegate(delegate);
 
@@ -236,6 +230,17 @@
     }
 }
 
+void ListViewWithPageHeader::initializeValuesForEmptyList()
+{
+    m_firstVisibleIndex = -1;
+    adjustMinYExtent();
+    setContentY(0);
+    m_clipItem->setY(0);
+    if (m_topSectionItem) {
+        QQuickItemPrivate::get(m_topSectionItem)->setCulled(true);
+    }
+}
+
 QQuickItem *ListViewWithPageHeader::header() const
 {
     return m_headerItem;
@@ -835,7 +840,7 @@
         }
     }
     if (!foundVisible) {
-        m_firstVisibleIndex = -1;
+        initializeValuesForEmptyList();
     }
     if (m_firstVisibleIndex != oldFirstVisibleIndex) {
         adjustMinYExtent();
@@ -1092,7 +1097,11 @@
     }
 
     if (m_firstVisibleIndex != oldFirstVisibleIndex) {
-        adjustMinYExtent();
+        if (m_visibleItems.isEmpty()) {
+            initializeValuesForEmptyList();
+        } else {
+            adjustMinYExtent();
+        }
     }
 
     for (int i = 0; i < m_visibleItems.count(); ++i) {
 
=== modified file 'plugins/Dash/listviewwithpageheader.h'
--- plugins/Dash/listviewwithpageheader.h	2015-11-26 13:50:56 +0000
+++ plugins/Dash/listviewwithpageheader.h	2016-02-11 14:27:32 +0000
@@ -168,6 +168,7 @@
     QQuickItem *getSectionItem(int modelIndex, bool alreadyInserted);
     QQuickItem *getSectionItem(const QString &sectionText);
     void updateSectionItem(int modelIndex);
+    void initializeValuesForEmptyList();
 
     QQmlDelegateModel *m_delegateModel;
 
 
=== added directory 'plugins/UInput'
=== added file 'tests/plugins/Dash/cardcreator/10.res'
--- tests/plugins/Dash/cardcreator/10.res	1970-01-01 00:00:00 +0000
+++ tests/plugins/Dash/cardcreator/10.res	2016-02-11 14:27:32 +0000
@@ -0,0 +1,142 @@
+AbstractButton { 
+                id: root; 
+                property var components; 
+                property var cardData; 
+                property string artShapeStyle: "inset"; 
+                property string backgroundShapeStyle: "inset"; 
+                property real fontScale: 1.0; 
+                property var scopeStyle: null; 
+                property int titleAlignment: Text.AlignLeft; 
+                property int fixedHeaderHeight: -1; 
+                property size fixedArtShapeSize: Qt.size(-1, -1); 
+                readonly property string title: cardData && cardData["title"] || ""; 
+                property bool asynchronous: true; 
+                property bool showHeader: true; 
+                implicitWidth: childrenRect.width; 
+                enabled: true; 
+                
+Loader {
+                                id: backgroundLoader; 
+                                objectName: "backgroundLoader"; 
+                                anchors.fill: parent; 
+                                asynchronous: root.asynchronous; 
+                                visible: status == Loader.Ready; 
+                                sourceComponent: UbuntuShape { 
+                                    objectName: "background"; 
+                                    radius: "medium"; 
+                                    aspect: { 
+                                        switch (root.backgroundShapeStyle) { 
+                                            case "inset": return UbuntuShape.Inset; 
+                                            case "shadow": return UbuntuShape.DropShadow; 
+                                            default: 
+                                            case "flat": return UbuntuShape.Flat; 
+                                        } 
+                                    } 
+                                    backgroundColor: getColor(0) || "white"; 
+                                    secondaryBackgroundColor: getColor(1) || backgroundColor; 
+                                    backgroundMode: UbuntuShape.VerticalGradient; 
+                                    anchors.fill: parent; 
+                                    source: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: Style.luminance(backgroundColor); 
+                                    property Image backgroundImage: Image { 
+                                        objectName: "backgroundImage"; 
+                                        source: { 
+                                            if (cardData && typeof cardData["background"] === "string") return cardData["background"]; 
+                                            else return ""; 
+                                        } 
+                                    } 
+                                    function getColor(index) { 
+                                        if (cardData && typeof cardData["background"] === "object" 
+                                            && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { 
+                                            return cardData["background"]["elements"][index]; 
+                                        } else return index === 0 ? "" : ""; 
+                                    } 
+                                } 
+                            }
+readonly property size artShapeSize: Qt.size(-1, -1);
+readonly property int headerHeight: row.height;
+Row { 
+                        id: row; 
+                        objectName: "outerRow"; 
+                        property real margins: units.gu(1); 
+                        spacing: margins; 
+                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; 
+                        anchors { top: parent.top; 
+                                     topMargin: units.gu(1);
+left: parent.left;
+ } 
+                        anchors.right: parent.right; 
+                        anchors.margins: margins; 
+                        anchors.rightMargin: 0; 
+                        data: [ 
+                                CroppedImageMinimumSourceSize { 
+                            id: mascotImage; 
+                            objectName: "mascotImage"; 
+                            anchors { verticalCenter: parent.verticalCenter; } 
+                            source: cardData && cardData["mascot"] || ""; 
+                            width: units.gu(6); 
+                            height: units.gu(5.625); 
+                            horizontalAlignment: Image.AlignHCenter; 
+                            verticalAlignment: Image.AlignVCenter; 
+                            visible: showHeader; 
+                             
+                        }
+,Item { 
+                            id: headerTitleContainer; 
+                            anchors { verticalCenter: parent.verticalCenter;  } 
+                            width: parent.width - x; 
+                            implicitHeight: titleLabel.height + subtitleLabel.height; 
+                            data: [ 
+                                Label { 
+                        id: titleLabel; 
+                        objectName: "titleLabel"; 
+                        anchors { right: parent.right; 
+rightMargin: units.gu(1); 
+left: parent.left; 
+                             top: parent.top; } 
+                        elide: Text.ElideRight; 
+                        fontSize: "small"; 
+                        wrapMode: Text.Wrap; 
+                        maximumLineCount: 2; 
+                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white"); 
+                        visible: showHeader ; 
+                        width: undefined; 
+                        text: root.title; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
+                    }
+,Label { 
+                            id: subtitleLabel; 
+                            objectName: "subtitleLabel"; 
+                            anchors { right: parent.right; 
+                               left: parent.left; 
+rightMargin: units.gu(1); 
+top: titleLabel.bottom;
+ } 
+                            anchors.topMargin: units.dp(2); 
+                            elide: Text.ElideRight; 
+                            maximumLineCount: 1; 
+                            fontSize: "x-small"; 
+                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white"); 
+                            visible: titleLabel.visible && titleLabel.text; 
+                            text: cardData && cardData["subtitle"] || ""; 
+                            font.weight: Font.Light; 
+                        }
+ 
+                            ]
+                        }
+ 
+                                ] 
+                    }
+UbuntuShape { 
+                        id: touchdown; 
+                        objectName: "touchdown"; 
+                        anchors { fill: backgroundLoader } 
+                        visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed; 
+                        radius: "medium"; 
+                        borderSource: "radius_pressed.sci" 
+                    }
+implicitHeight: row.y + row.height + units.gu(1);
+}
 
=== modified file 'tests/plugins/Dash/cardcreator/10.tst'
--- tests/plugins/Dash/cardcreator/10.tst	2016-01-21 22:33:46 +0000
+++ tests/plugins/Dash/cardcreator/10.tst	2016-02-11 14:27:32 +0000
@@ -1,2 +1,3 @@
-template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2, "card-background": { "type": "color", "elements": [ "\" : \"\";} Item { } function moo() { return true ? \"" ] } }
+template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2, "card-background": { "type": "color", "elements": [ "\\", ": 3; } Item { } function moo ()  { \"" ] } }
 components: {"art":{"aspect-ratio":1},"background":{"field":"background"},"mascot":{"field":"icon"},"subtitle":{"field":"author"},"title":{"field":"title"},"attributes":{}}
+result: 10.res
 \ No newline at end of file
 
=== added file 'tests/plugins/Dash/cardcreator/11.res'
--- tests/plugins/Dash/cardcreator/11.res	1970-01-01 00:00:00 +0000
+++ tests/plugins/Dash/cardcreator/11.res	2016-02-11 14:27:32 +0000
@@ -0,0 +1,217 @@
+AbstractButton { 
+                id: root; 
+                property var components; 
+                property var cardData; 
+                property string artShapeStyle: "inset"; 
+                property string backgroundShapeStyle: "inset"; 
+                property real fontScale: 1.0; 
+                property var scopeStyle: null; 
+                property int titleAlignment: Text.AlignLeft; 
+                property int fixedHeaderHeight: -1; 
+                property size fixedArtShapeSize: Qt.size(-1, -1); 
+                readonly property string title: cardData && cardData["title"] || ""; 
+                property bool asynchronous: true; 
+                property bool showHeader: true; 
+                implicitWidth: childrenRect.width; 
+                enabled: true; 
+                
+Loader {
+                                id: backgroundLoader; 
+                                objectName: "backgroundLoader"; 
+                                anchors.fill: parent; 
+                                asynchronous: root.asynchronous; 
+                                visible: status == Loader.Ready; 
+                                sourceComponent: UbuntuShape { 
+                                    objectName: "background"; 
+                                    radius: "medium"; 
+                                    aspect: { 
+                                        switch (root.backgroundShapeStyle) { 
+                                            case "inset": return UbuntuShape.Inset; 
+                                            case "shadow": return UbuntuShape.DropShadow; 
+                                            default: 
+                                            case "flat": return UbuntuShape.Flat; 
+                                        } 
+                                    } 
+                                    backgroundColor: getColor(0) || "white"; 
+                                    secondaryBackgroundColor: getColor(1) || backgroundColor; 
+                                    backgroundMode: UbuntuShape.VerticalGradient; 
+                                    anchors.fill: parent; 
+                                    source: backgroundImage.source ? backgroundImage : null; 
+                                    property real luminance: Style.luminance(backgroundColor); 
+                                    property Image backgroundImage: Image { 
+                                        objectName: "backgroundImage"; 
+                                        source: { 
+                                            if (cardData && typeof cardData["background"] === "string") return cardData["background"]; 
+                                            else return ""; 
+                                        } 
+                                    } 
+                                    function getColor(index) { 
+                                        if (cardData && typeof cardData["background"] === "object" 
+                                            && (cardData["background"]["type"] === "color" || cardData["background"]["type"] === "gradient")) { 
+                                            return cardData["background"]["elements"][index]; 
+                                        } else return index === 0 ? "#E9E9E9" : undefined; 
+                                    } 
+                                } 
+                            }
+readonly property size artShapeSize: artShapeLoader.item ? Qt.size(artShapeLoader.item.width, artShapeLoader.item.height) : Qt.size(-1, -1);
+Item { 
+                            id: artShapeHolder; 
+                            height: root.fixedArtShapeSize.height > 0 ? root.fixedArtShapeSize.height : artShapeLoader.height; 
+                            width: root.fixedArtShapeSize.width > 0 ? root.fixedArtShapeSize.width : artShapeLoader.width; 
+                            anchors { horizontalCenter: parent.horizontalCenter; } 
+                            Loader { 
+                                id: artShapeLoader; 
+                                objectName: "artShapeLoader"; 
+                                active: cardData && cardData["art"] || false; 
+                                asynchronous: root.asynchronous; 
+                                visible: status == Loader.Ready; 
+                                sourceComponent: Item { 
+                                    id: artShape; 
+                                    objectName: "artShape"; 
+                                    readonly property bool doShapeItem: components["art"]["conciergeMode"] !== true; 
+                                    visible: image.status == Image.Ready; 
+                                    readonly property alias image: artImage; 
+                                    ShaderEffectSource { 
+                                        id: artShapeSource; 
+                                        sourceItem: artImage; 
+                                        anchors.centerIn: parent; 
+                                        width: 1; 
+                                        height: 1; 
+                                        hideSource: doShapeItem; 
+                                    } 
+                                    Loader { 
+                                        anchors.fill: parent; 
+                                        visible: artShape.doShapeItem; 
+                                        sourceComponent: root.artShapeStyle === "icon" ? artShapeIconComponent : artShapeShapeComponent; 
+                                        Component { 
+                                            id: artShapeShapeComponent; 
+                                            UbuntuShape { 
+                                                source: artShapeSource; 
+                                                sourceFillMode: UbuntuShape.PreserveAspectCrop; 
+                                                radius: "medium"; 
+                                                aspect: { 
+                                                    switch (root.artShapeStyle) { 
+                                                        case "inset": return UbuntuShape.Inset; 
+                                                        case "shadow": return UbuntuShape.DropShadow; 
+                                                        default: 
+                                                        case "flat": return UbuntuShape.Flat; 
+                                                    } 
+                                                } 
+                                            } 
+                                        } 
+                                        Component { 
+                                            id: artShapeIconComponent; 
+                                            ProportionalShape { source: artShapeSource; aspect: UbuntuShape.DropShadow; } 
+                                        } 
+                                    } 
+                                    readonly property real fixedArtShapeSizeAspect: (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) ? root.fixedArtShapeSize.width / root.fixedArtShapeSize.height : -1; 
+                                    readonly property real aspect: fixedArtShapeSizeAspect > 0 ? fixedArtShapeSizeAspect : components !== undefined ? components["art"]["aspect-ratio"] : 1; 
+                                    Component.onCompleted: { updateWidthHeightBindings(); } 
+                                    Connections { target: root; onFixedArtShapeSizeChanged: updateWidthHeightBindings(); } 
+                                    function updateWidthHeightBindings() { 
+                                        if (root.fixedArtShapeSize.height > 0 && root.fixedArtShapeSize.width > 0) { 
+                                            width = root.fixedArtShapeSize.width; 
+                                            height = root.fixedArtShapeSize.height; 
+                                        } else { 
+                                            width = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.width }); 
+                                            height = Qt.binding(function() { return image.status !== Image.Ready ? 0 : image.height }); 
+                                        } 
+                                    } 
+                                    CroppedImageMinimumSourceSize { 
+                                        id: artImage; 
+                                        objectName: "artImage"; 
+                                        source: cardData && cardData["art"] || ""; 
+                                        asynchronous: root.asynchronous; 
+                                        width: root.width; 
+                                        height: width / artShape.aspect; 
+                                        onStatusChanged: if (status === Image.Error) source = decodeURI("%5C");
+                                    } 
+                                } 
+                            } 
+                        }
+readonly property int headerHeight: row.height;
+Row { 
+                        id: row; 
+                        objectName: "outerRow"; 
+                        property real margins: units.gu(1); 
+                        spacing: margins; 
+                        height: root.fixedHeaderHeight != -1 ? root.fixedHeaderHeight : implicitHeight; 
+                        anchors { top: artShapeHolder.bottom; 
+                                         topMargin: units.gu(1);
+left: parent.left;
+ } 
+                        anchors.right: parent.right; 
+                        anchors.margins: margins; 
+                        anchors.rightMargin: 0; 
+                        data: [ 
+                                CroppedImageMinimumSourceSize { 
+                            id: mascotImage; 
+                            objectName: "mascotImage"; 
+                            anchors { verticalCenter: parent.verticalCenter; } 
+                            source: cardData && cardData["mascot"] || ""; 
+                            width: units.gu(6); 
+                            height: units.gu(5.625); 
+                            horizontalAlignment: Image.AlignHCenter; 
+                            verticalAlignment: Image.AlignVCenter; 
+                            visible: showHeader; 
+                             onStatusChanged: if (status === Image.Error) source = decodeURI("%22");
+                        }
+,Item { 
+                            id: headerTitleContainer; 
+                            anchors { verticalCenter: parent.verticalCenter;  } 
+                            width: parent.width - x; 
+                            implicitHeight: titleLabel.height + subtitleLabel.height; 
+                            data: [ 
+                                Label { 
+                        id: titleLabel; 
+                        objectName: "titleLabel"; 
+                        anchors { right: parent.right; 
+rightMargin: units.gu(1); 
+left: parent.left; 
+                             top: parent.top; } 
+                        elide: Text.ElideRight; 
+                        fontSize: "small"; 
+                        wrapMode: Text.Wrap; 
+                        maximumLineCount: 2; 
+                        font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
+                        color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white"); 
+                        visible: showHeader ; 
+                        width: undefined; 
+                        text: root.title; 
+                        font.weight: cardData && cardData["subtitle"] ? Font.DemiBold : Font.Normal; 
+                        horizontalAlignment: root.titleAlignment; 
+                    }
+,Label { 
+                            id: subtitleLabel; 
+                            objectName: "subtitleLabel"; 
+                            anchors { right: parent.right; 
+                               left: parent.left; 
+rightMargin: units.gu(1); 
+top: titleLabel.bottom;
+ } 
+                            anchors.topMargin: units.dp(2); 
+                            elide: Text.ElideRight; 
+                            maximumLineCount: 1; 
+                            fontSize: "x-small"; 
+                            font.pixelSize: Math.round(FontUtils.sizeToPixels(fontSize) * fontScale); 
+                            color: backgroundLoader.active && backgroundLoader.item && root.scopeStyle ? root.scopeStyle.getTextColor(backgroundLoader.item.luminance) : (backgroundLoader.item && backgroundLoader.item.luminance > 0.7 ? theme.palette.normal.baseText : "white"); 
+                            visible: titleLabel.visible && titleLabel.text; 
+                            text: cardData && cardData["subtitle"] || ""; 
+                            font.weight: Font.Light; 
+                        }
+ 
+                            ]
+                        }
+ 
+                                ] 
+                    }
+UbuntuShape { 
+                        id: touchdown; 
+                        objectName: "touchdown"; 
+                        anchors { fill: backgroundLoader } 
+                        visible: root.artShapeStyle != "shadow" && root.artShapeStyle != "icon" && root.pressed; 
+                        radius: "medium"; 
+                        borderSource: "radius_pressed.sci" 
+                    }
+implicitHeight: row.y + row.height + units.gu(1);
+}
 
=== added file 'tests/plugins/Dash/cardcreator/11.tst'
--- tests/plugins/Dash/cardcreator/11.tst	1970-01-01 00:00:00 +0000
+++ tests/plugins/Dash/cardcreator/11.tst	2016-02-11 14:27:32 +0000
@@ -0,0 +1,3 @@
+template: {"card-background":{"elements":["#E9E9E9"],"type":"color"},"card-layout":"vertical","card-size":"medium","category-layout":"grid","collapsed-rows":2 }
+components: {"art":{"aspect-ratio":1,"field":"art","fallback":"\\"},"background":{"field":"background"},"mascot":{"field":"icon","fallback":"\""},"subtitle":{"field":"author"},"title":{"field":"title"},"attributes":{}}
+result: 11.res
 \ No newline at end of file
 
=== modified file 'tests/plugins/Dash/cardcreator/3.res'
--- tests/plugins/Dash/cardcreator/3.res	2016-01-21 22:44:41 +0000
+++ tests/plugins/Dash/cardcreator/3.res	2016-02-11 14:27:32 +0000
@@ -86,7 +86,7 @@
                                         asynchronous: root.asynchronous;
                                         width: root.width;
                                         height: width / artShape.aspect;
-                                        onStatusChanged: if (status === Image.Error) source = "IHAVE\"ESCAPED\"QUOTES\"";
+                                        onStatusChanged: if (status === Image.Error) source = decodeURI("IHAVE%5C%22ESCAPED%5C%22QUOTES%5C%22");
                                     }
                                 } 
                             } 
 
=== modified file 'tests/plugins/Dash/cardcreator/6.res'
--- tests/plugins/Dash/cardcreator/6.res	2015-11-20 16:33:38 +0000
+++ tests/plugins/Dash/cardcreator/6.res	2016-02-11 14:27:32 +0000
@@ -42,7 +42,7 @@
                                         objectName: "backgroundImage"; 
                                         source: { 
                                             if (cardData && typeof cardData["background"] === "string") return cardData["background"]; 
-                                            else return "http://assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-grey.png";
+                                            else return decodeURI("http://assets.ubuntu.com/sites/ubuntu/latest/u/img/logos/logo-ubuntu-grey.png");
                                         } 
                                     } 
                                     function getColor(index) { 
 
=== modified file 'tests/plugins/Dash/cardcreatortest.cpp'
--- tests/plugins/Dash/cardcreatortest.cpp	2016-01-21 22:33:46 +0000
+++ tests/plugins/Dash/cardcreatortest.cpp	2016-02-11 14:27:32 +0000
@@ -63,6 +63,7 @@
 
             QVERIFY(lines[0].startsWith(templateString));
             QVERIFY(lines[1].startsWith(componentsString));
+            QVERIFY(lines[2].startsWith(resultString));
 
             const QString templateJSON = lines[0].mid(templateString.length());
             const QString componentsJSON = lines[1].mid(componentsString.length());
@@ -71,32 +72,30 @@
             QVariant cardStringResult;
             QMetaObject::invokeMethod(view->rootObject(), "cardString", Q_RETURN_ARG(QVariant, cardStringResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));
 
-            if (!resultFileName.isEmpty()) {
-                QFile testResultFile(testDirPath + resultFileName);
-                QVERIFY(testResultFile.open(QIODevice::ReadOnly));
-                QTextStream ts2(&testResultFile);
-
-                // Record failed results to /tmp
-                const QString executedResult = cardStringResult.toString();
-                QTemporaryFile tmpFile(QDir::tempPath() + QDir::separator() + "testCardCreatorFailedResultXXXXXX");
-                tmpFile.open();
-                tmpFile.setAutoRemove(false);
-                tmpFile.write(executedResult.toUtf8().constData());
-
-                // Line by line comparison
-                const QStringList expectedLines = ts2.readAll().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
-                const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
-                for (int i = 0; i < expectedLines.size(); ++i) {
-                    QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());
-                }
-
-                // Remove the result if it passed
-                tmpFile.setAutoRemove(true);
+            QFile testResultFile(testDirPath + resultFileName);
+            QVERIFY(testResultFile.open(QIODevice::ReadOnly));
+            QTextStream ts2(&testResultFile);
+
+            // Record failed results to /tmp
+            const QString executedResult = cardStringResult.toString();
+            QTemporaryFile tmpFile(QDir::tempPath() + QDir::separator() + "testCardCreatorFailedResultXXXXXX");
+            tmpFile.open();
+            tmpFile.setAutoRemove(false);
+            tmpFile.write(executedResult.toUtf8().constData());
+
+            // Line by line comparison
+            const QStringList expectedLines = ts2.readAll().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
+            const QStringList cardStringResultLines = cardStringResult.toString().trimmed().replace(QRegExp("\n\\s*\n"),"\n").split("\n");
+            for (int i = 0; i < expectedLines.size(); ++i) {
+                QCOMPARE(cardStringResultLines[i].simplified(), expectedLines[i].simplified());
             }
 
+            // Remove the result if it passed
+            tmpFile.setAutoRemove(true);
+
             QVariant createCardComponentResult;
             QMetaObject::invokeMethod(view->rootObject(), "createCardComponent", Q_RETURN_ARG(QVariant, createCardComponentResult), Q_ARG(QVariant, templateJSON), Q_ARG(QVariant, componentsJSON));
-            QCOMPARE(createCardComponentResult.toBool(), !resultFileName.isEmpty());
+            QVERIFY(createCardComponentResult.toBool());
         }
     }
 
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.cpp'
--- tests/plugins/Dash/listviewwithpageheadertest.cpp	2015-09-02 08:04:41 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.cpp	2016-02-11 14:27:32 +0000
@@ -1954,6 +1954,29 @@
         QCOMPARE(lvwph->m_firstVisibleIndex, 0);
     }
 
+    void testBug1540490()
+    {
+        lvwph->header()->setImplicitHeight(150);
+        verifyItem(0, 150., 150., false);
+
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 3), Q_ARG(QVariant, 3));
+        model->setProperty(0, "size", 400);
+        model->setProperty(1, "size", 600);
+        model->setProperty(2, "size", 300);
+
+        scrollToBottom();
+        changeContentY(-200);
+
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 1), Q_ARG(QVariant, 2));
+        model->setProperty(0, "size", 100);
+        QMetaObject::invokeMethod(model, "removeItems", Q_ARG(QVariant, 0), Q_ARG(QVariant, 1));
+        lvwph->header()->setImplicitHeight(50);
+        QMetaObject::invokeMethod(model, "insertItem", Q_ARG(QVariant, 0), Q_ARG(QVariant, 200));
+
+        QTRY_COMPARE(lvwph->m_visibleItems.count(), 1);
+        verifyItem(0, 50., 200., false);
+    }
+
 private:
     QQuickView *view;
     ListViewWithPageHeader *lvwph;
 
=== modified file 'tests/plugins/Dash/listviewwithpageheadertest.qml'
--- tests/plugins/Dash/listviewwithpageheadertest.qml	2015-07-15 15:07:19 +0000
+++ tests/plugins/Dash/listviewwithpageheadertest.qml	2016-02-11 14:27:32 +0000
@@ -85,7 +85,6 @@
         pageHeader: Rectangle {
             color: "transparent"
             width: parent.width
-            height: 50
             implicitHeight: 50
             Text {
                 anchors.fill: parent