← Back to branch summary

~ubuntu-shorts-dev/ubuntu-rssreader-app/reboot

« back to all changes in this revision

Viewing changes to shorts/qml/content/ImportFeeds.qml

  • Committer: Tarmac
  • Author(s): Joey Chan
  • Date: 2016-06-15 16:18:41 UTC
  • mfrom: (419.1.9 ubuntu-rssreader-app)
  • Revision ID: tarmac-20160615161841-u7sq5wvodvt4nd8y
fix crash bug, rewrite opml parser, update xml2json with latest upstream. fix bug 1543995.

And a new help page. Fixes: https://bugs.launchpad.net/bugs/1543736, https://bugs.launchpad.net/bugs/1543995, https://bugs.launchpad.net/bugs/1546443, https://bugs.launchpad.net/bugs/1562315, https://bugs.launchpad.net/bugs/1565406.

Approved by Jenkins Bot.

Show diffs side-by-side

added added

removed removed

Lines of Context:
shorts/qml/content/ImportFeeds.qml
45
45
            DB.importOPMLobject(repeaterFeedList.opmlList)
46
46
            mainView.reloadViews()
47
47
            pageStack.pop()
 
48
            pageStack.pop()
48
49
            mainView.refresh()
 
50
//            print ("repeaterFeedList.opmlList: ", JSON.stringify(repeaterFeedList.opmlList[0]))
49
51
        }
50
52
    }
51
53
 
147
149
 
148
150
                    ListItem.Empty {
149
151
                        id: liStandardRoot
 
152
                        height: units.gu(6.5)
150
153
 
151
154
                        property var opmlRoot: repeaterFeedList.opmlList == undefined ?
152
155
                            undefined : repeaterFeedList.opmlList[index]
172
175
 
173
176
                            CheckBox {
174
177
                                id: checkboxRoot
 
178
                                anchors.verticalCenter: parent.verticalCenter
175
179
                            }
176
180
 
177
181
                            Label{
217
221
                    Repeater {
218
222
                        id: repeaterFeedsChildren
219
223
                        model: liStandardRoot.opmlRoot == undefined ?
220
 
                                   "" : liStandardRoot.opmlRoot.children
 
224
//                                   "" : liStandardRoot.opmlRoot.children
 
225
                                   "" : liStandardRoot.opmlRoot.outline
221
226
 
222
227
                        ListItem.Standard {
223
228
                            id: listitemFeed
227
232
//                            height: visible ? units.gu(6) : 0
228
233
 
229
234
                            property var opmlFeed: liStandardRoot.opmlRoot == undefined ?
230
 
                                undefined : liStandardRoot.opmlRoot.children[index]
 
235
                                                       undefined : liStandardRoot.opmlRoot.outline[index]
 
236
//                                undefined : liStandardRoot.opmlRoot.children[index]
 
237
//                                                       undefined : (liStandardRoot.opmlRoot.outline[index] == undefined ?
 
238
//                                                                        liStandardRoot.opmlRoot.outline : liStandardRoot.opmlRoot.outline[index])
231
239
 
232
240
                            Connections {
233
241
                                target: liStandardRoot