Refactoring and model improvements

[quicknewsreader] / qml / QuickNewsReader / content / view / NewsDetail.qml

diff --git a/qml/QuickNewsReader/content/view/NewsDetail.qml b/qml/QuickNewsReader/content/view/NewsDetail.qml
index 211b395..049de65 100644 (file)
--- a/qml/QuickNewsReader/content/view/NewsDetail.qml
+++ b/qml/QuickNewsReader/content/view/NewsDetail.qml
@@ -5,19 +5,21 @@ Item {
     id: newsDetailRect
     width: window.width; height: window.height
 
-    function getNewsModelItem(newsIndex, prop)
+    function getNewsModelItem(prop)
     {
-        if( typeof currentJournal.newsModel.get(newsIndex) != "undefined" )
-            if( typeof currentJournal.newsModel.get(newsIndex)[prop] != "undefined" )
-                return currentJournal.newsModel.get(newsIndex)[prop]
+        var newsIndex = listSourceModel[window.currentSourceIndex].currentPath[componentDepth-1]
+
+        if( typeof currentSource.listModels[componentDepth-1].get(newsIndex) != "undefined" )
+            if( typeof currentSource.listModels[componentDepth-1].get(newsIndex)[prop] != "undefined" )
+                return currentSource.listModels[componentDepth-1].get(newsIndex)[prop]
 
         return ""
     }
 
-    property string urllink: getNewsModelItem(currentNewsIndex, 'link')
-    property string htmlcontent: getNewsModelItem(currentNewsIndex, 'detailedContent')
-    property string title: getNewsModelItem(currentNewsIndex, 'title')
-    property string image: getNewsModelItem(currentNewsIndex, 'image')
+    property string urllink: getNewsModelItem('link')
+    property string htmlcontent: getNewsModelItem('detailedContent')
+    property string title: getNewsModelItem('title')
+    property string image: getNewsModelItem('image')
 
     VisualItemModel {
         id: itemModel