1 files changed, 9 insertions, 44 deletions

diff --git a/components/package/contents/ui/ContentView.qml b/components/package/contents/ui/ContentView.qml
index d4ddabce..a8f4c437 100644
--- a/components/package/contents/ui/ContentView.qml
+++ b/components/package/contents/ui/ContentView.qml
@@ -1,6 +1,5 @@
 import QtQuick 2.4
 import QtQuick.Controls 1.3
-import QtWebKit 3.0
 
 Item {
     id: root
@@ -8,7 +7,8 @@ Item {
     property bool isHtml;
     property string content;
     property string contentType;
-    height: contentRect.height
+    property int contentWidth: contentLoader.item.contentWidth
+    property int contentHeight: contentLoader.item.contentHeight
     Rectangle {
         id: contentRect
 
@@ -17,61 +17,26 @@ Item {
         // border.color: "black"
         // radius: 5
         // anchors.leftMargin: nestingLevel * 5
-
-        height: contentLoader.height
-        width: root.width
+        anchors.fill: parent
 
         Loader {
             id: contentLoader
-            anchors.top: contentRect.top
-            anchors.left: contentRect.left
-            width: contentRect.width
+            property string content: root.content
+            anchors.fill: parent
             sourceComponent: isHtml ? htmlComponent : textComponent
-            height: isHtml ? item.flickableItem.contentHeight : text.height
-            onStatusChanged: {
-                if (isHtml) {
-                    item.flickableItem.loadHtml(root.content, "file:///");
-                }
-            }
         }
 
         Component {
             id: textComponent
-            Text {
-                id: text
-                text: content
+            TextView {
+                content: root.content
             }
         }
         Component {
             id: htmlComponent
-            //We need the scrollview so the WebView can fully expand so we have access to the contentHeight
-            //Otherwise it would just scale the content.
-            ScrollView {
-                horizontalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                verticalScrollBarPolicy: Qt.ScrollBarAlwaysOff
-                WebView {
-                    id: htmlView
-                    onNavigationRequested: {
-                        // detect URL scheme prefix, most likely an external link
-                        var schemaRE = /^\w+:/;
-                        if (schemaRE.test(request.url)) {
-                            request.action = WebView.AcceptRequest;
-                        } else {
-                            request.action = WebView.IgnoreRequest;
-                            // delegate request.url here
-                        }
-                    }
-                    onLoadingChanged: {
-                        console.warn("Error is ", loadRequest.errorString);
-                        console.warn("Status is ", loadRequest.status);
-                    }
-                }
+            WebView {
+                content: root.content
             }
         }
     }
-    onContentChanged: {
-        if (isHtml) {
-            contentLoader.item.flickableItem.loadHtml(content, "file:///");
-        }
-    }
 }