Ubuntu Shorts App

Merge lp:~mrqtros/ubuntu-rssreader-app/uitk13-few-fixes into lp:ubuntu-rssreader-app

  1. uitk13-few-fixes
  2. Merge into reboot
Proposed by Roman Shchekin
Status: Superseded
Proposed branch: lp:~mrqtros/ubuntu-rssreader-app/uitk13-few-fixes
Merge into: lp:ubuntu-rssreader-app
Diff against target: 661 lines (+122/-120)
31 files modified
manifest.json.4pro (+1/-1)
manifest.json.in (+1/-1)
shorts.apparmor (+1/-1)
shorts/po/com.ubuntu.shorts.pot (+38/-30)
shorts/qml/components/ArticleViewItem.qml (+3/-3)
shorts/qml/components/BottomEdgeTabs.qml (+2/-2)
shorts/qml/components/FakeHeader.qml (+1/-1)
shorts/qml/components/GridModeItem.qml (+3/-3)
shorts/qml/components/ListModeItem.qml (+3/-3)
shorts/qml/components/NetworkManager.qml (+3/-3)
shorts/qml/components/OrganicGrid.qml (+1/-1)
shorts/qml/components/ReadingOptions.qml (+3/-3)
shorts/qml/content/SharePage.qml (+1/-1)
shorts/qml/delegates/ArticleFullImg.qml (+2/-2)
shorts/qml/delegates/ArticleOneImgA.qml (+2/-2)
shorts/qml/delegates/ArticleTextA.qml (+2/-2)
shorts/qml/delegates/ArticleTextB.qml (+2/-2)
shorts/qml/pages/AppendFeedPage.qml (+3/-3)
shorts/qml/pages/ArticleViewPage.qml (+3/-3)
shorts/qml/pages/ChooseTopicPage.qml (+3/-3)
shorts/qml/pages/CreateTopicPage.qml (+3/-3)
shorts/qml/pages/EditFeedPage.qml (+5/-5)
shorts/qml/pages/FeedComponent.qml (+1/-1)
shorts/qml/pages/TopicComponent.qml (+2/-2)
shorts/qml/pages/TopicManagement.qml (+3/-3)
shorts/qml/shorts-app.qml (+3/-3)
shorts/qml/tabs/BaseTab.qml (+3/-3)
shorts/qml/tabs/SavedTab.qml (+3/-3)
shorts/qml/tabs/ShortsTab.qml (+3/-3)
shorts/qml/tabs/TopicTab.qml (+3/-3)
shorts/qml/utils/imgSeparator.js (+15/-21)
To merge this branch: bzr merge lp:~mrqtros/ubuntu-rssreader-app/uitk13-few-fixes
Reviewer Review Type Date Requested Status
Ubuntu Phone Apps Jenkins Bot continuous-integration Needs Fixing
Jenkins Bot continuous-integration Needs Fixing
Ubuntu Shorts Developers Pending
Review via email: mp+275623@code.launchpad.net

This proposal has been superseded by a proposal from 2015-10-24.

Commit message

* Manifest version fro PRO
* BottomEdgeTabs fixed
* Regex for image parsing

Description of the change

* Manifest version fro PRO
* BottomEdgeTabs fixed
* Regex for image parsing

To post a comment you must log in.
Revision history for this message
Jenkins Bot (ubuntu-core-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:411
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/4/
Executed test runs:
    None: https://core-apps-jenkins.ubuntu.com/job/generic-update-mp/54/console

Click here to trigger a rebuild:
https://core-apps-jenkins.ubuntu.com/job/shorts-app-ci/4/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

FAILED: Continuous integration, rev:411
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/345/
Executed test runs:
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-utopic-amd64-ci/73/console
    FAILURE: http://91.189.93.70:8080/job/ubuntu-rssreader-app-vivid-amd64-ci/70/console

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/ubuntu-rssreader-app-ci/345/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'manifest.json.4pro'
2--- manifest.json.4pro 2015-07-21 19:41:58 +0000
3+++ manifest.json.4pro 2015-10-24 11:39:00 +0000
4@@ -11,5 +11,5 @@
5 },
6 "version": "1.0.6",
7 "maintainer": "Roman Shchekin <mrqtros@gmail.com>",
8- "framework": "ubuntu-sdk-15.04"
9+ "framework": "ubuntu-sdk-15.04.1-qml"
10 }
11
12=== modified file 'manifest.json.in'
13--- manifest.json.in 2015-07-17 14:42:42 +0000
14+++ manifest.json.in 2015-10-24 11:39:00 +0000
15@@ -1,7 +1,7 @@
16 {
17 "architecture": "@CLICK_ARCH@",
18 "description": "Rss Reader application",
19- "framework": "ubuntu-sdk-15.04",
20+ "framework": "ubuntu-sdk-15.04.1-qml",
21 "hooks": {
22 "shorts": {
23 "apparmor": "shorts.apparmor",
24
25=== modified file 'shorts.apparmor'
26--- shorts.apparmor 2015-07-04 08:38:18 +0000
27+++ shorts.apparmor 2015-10-24 11:39:00 +0000
28@@ -4,4 +4,4 @@
29 "content_exchange_source"
30 ],
31 "policy_version": 1.3
32-}
33\ No newline at end of file
34+}
35
36=== modified file 'shorts/po/com.ubuntu.shorts.pot'
37--- shorts/po/com.ubuntu.shorts.pot 2015-08-11 12:07:22 +0000
38+++ shorts/po/com.ubuntu.shorts.pot 2015-10-24 11:39:00 +0000
39@@ -8,7 +8,7 @@
40 msgstr ""
41 "Project-Id-Version: \n"
42 "Report-Msgid-Bugs-To: \n"
43-"POT-Creation-Date: 2015-08-11 20:00+0800\n"
44+"POT-Creation-Date: 2015-10-23 22:15+0800\n"
45 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
46 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
47 "Language-Team: LANGUAGE <LL@li.org>\n"
48@@ -18,32 +18,32 @@
49 "Content-Transfer-Encoding: 8bit\n"
50 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
51
52-#: ../qml/components/ArticleViewItem.qml:122
53+#: ../qml/components/ArticleViewItem.qml:120
54 msgid "Select article"
55 msgstr ""
56
57-#: ../qml/components/ReadingOptions.qml:40
58+#: ../qml/components/ReadingOptions.qml:39
59 msgid "Dark"
60 msgstr ""
61
62-#: ../qml/components/ReadingOptions.qml:50
63+#: ../qml/components/ReadingOptions.qml:46
64 msgid "Light"
65 msgstr ""
66
67-#: ../qml/components/ReadingOptions.qml:107
68+#: ../qml/components/ReadingOptions.qml:96
69 msgid "Small"
70 msgstr ""
71
72-#: ../qml/components/ReadingOptions.qml:109
73-msgid "Mid"
74+#: ../qml/components/ReadingOptions.qml:98
75+msgid "Normal"
76 msgstr ""
77
78-#: ../qml/components/ReadingOptions.qml:110
79+#: ../qml/components/ReadingOptions.qml:99
80 msgid "Large"
81 msgstr ""
82
83-#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:234
84-#: ../qml/shorts-app.qml:369
85+#: ../qml/pages/AppendFeedPage.qml:31 ../qml/shorts-app.qml:243
86+#: ../qml/shorts-app.qml:378
87 msgid "Add feeds"
88 msgstr ""
89
90@@ -63,28 +63,28 @@
91 msgid "Type a keyword or URL"
92 msgstr ""
93
94-#: ../qml/pages/AppendFeedPage.qml:187
95+#: ../qml/pages/AppendFeedPage.qml:185
96 msgid "Search results"
97 msgstr ""
98
99-#: ../qml/pages/AppendFeedPage.qml:245 ../qml/pages/CreateTopicPage.qml:38
100-#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:447
101+#: ../qml/pages/AppendFeedPage.qml:243 ../qml/pages/CreateTopicPage.qml:38
102+#: ../qml/pages/TopicManagement.qml:239 ../qml/shorts-app.qml:456
103 msgid "Cancel"
104 msgstr ""
105
106-#: ../qml/pages/AppendFeedPage.qml:278
107+#: ../qml/pages/AppendFeedPage.qml:276
108 msgid "Next"
109 msgstr ""
110
111-#: ../qml/pages/AppendFeedPage.qml:307 ../qml/pages/CreateTopicPage.qml:181
112+#: ../qml/pages/AppendFeedPage.qml:305 ../qml/pages/CreateTopicPage.qml:181
113 msgid "No feeds"
114 msgstr ""
115
116-#: ../qml/pages/ArticleViewPage.qml:44
117+#: ../qml/pages/ArticleViewPage.qml:47
118 msgid "Save"
119 msgstr ""
120
121-#: ../qml/pages/ArticleViewPage.qml:44
122+#: ../qml/pages/ArticleViewPage.qml:47
123 msgid "Remove"
124 msgstr ""
125
126@@ -161,7 +161,7 @@
127 msgid "Topic: "
128 msgstr ""
129
130-#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:218
131+#: ../qml/pages/TopicManagement.qml:13 ../qml/shorts-app.qml:217
132 msgid "Edit topics"
133 msgstr ""
134
135@@ -185,51 +185,59 @@
136 msgid "List view"
137 msgstr ""
138
139-#: ../qml/shorts-app.qml:300
140+#: ../qml/shorts-app.qml:227
141+msgid "Disable night mode"
142+msgstr ""
143+
144+#: ../qml/shorts-app.qml:227
145+msgid "Enable night mode"
146+msgstr ""
147+
148+#: ../qml/shorts-app.qml:309
149 msgid "Saved"
150 msgstr ""
151
152-#: ../qml/shorts-app.qml:308 shorts.desktop.in.in.h:1
153+#: ../qml/shorts-app.qml:317 shorts.desktop.in.in.h:1
154 msgid "Shorts"
155 msgstr ""
156
157-#: ../qml/shorts-app.qml:439
158+#: ../qml/shorts-app.qml:448
159 msgid "Checking for new articles"
160 msgstr ""
161
162-#: ../qml/shorts-app.qml:463
163+#: ../qml/shorts-app.qml:472
164 msgid "Perhaps some of the channels have not been updated."
165 msgstr ""
166
167-#: ../qml/shorts-app.qml:464
168+#: ../qml/shorts-app.qml:473
169 msgid "Errors occurred during the update"
170 msgstr ""
171
172-#: ../qml/shorts-app.qml:482
173+#: ../qml/shorts-app.qml:491
174 msgid "+ Add feeds"
175 msgstr ""
176
177-#: ../qml/shorts-app.qml:494
178+#: ../qml/shorts-app.qml:503
179 msgid "Add online accounts"
180 msgstr ""
181
182-#: ../qml/shorts-app.qml:497
183+#: ../qml/shorts-app.qml:506
184 msgid "Online accounts are not available for now"
185 msgstr ""
186
187-#: ../qml/shorts-app.qml:498 ../qml/shorts-app.qml:507
188+#: ../qml/shorts-app.qml:507 ../qml/shorts-app.qml:516
189 msgid "We are sorry"
190 msgstr ""
191
192-#: ../qml/shorts-app.qml:503
193+#: ../qml/shorts-app.qml:512
194 msgid "Import subscriptions"
195 msgstr ""
196
197-#: ../qml/shorts-app.qml:506
198+#: ../qml/shorts-app.qml:515
199 msgid "Importing subscriptions is not available for now"
200 msgstr ""
201
202-#: ../qml/shorts-app.qml:521
203+#: ../qml/shorts-app.qml:530
204 msgid "Ok"
205 msgstr ""
206
207
208=== modified file 'shorts/qml/components/ArticleViewItem.qml'
209--- shorts/qml/components/ArticleViewItem.qml 2015-10-10 11:24:04 +0000
210+++ shorts/qml/components/ArticleViewItem.qml 2015-10-24 11:39:00 +0000
211@@ -8,9 +8,9 @@
212
213 import QtQuick 2.4
214 import QtQuick.XmlListModel 2.0
215-import Ubuntu.Components 1.2
216-import Ubuntu.Components.ListItems 1.0 as ListItem
217-import Ubuntu.Components.Popups 1.0
218+import Ubuntu.Components 1.3
219+import Ubuntu.Components.ListItems 1.3 as ListItem
220+import Ubuntu.Components.Popups 1.3
221
222 import "../utils/dateutils.js" as DateUtils
223 import "../utils/databasemodule_v2.js" as DB
224
225=== modified file 'shorts/qml/components/BottomEdgeTabs.qml'
226--- shorts/qml/components/BottomEdgeTabs.qml 2015-07-04 08:38:18 +0000
227+++ shorts/qml/components/BottomEdgeTabs.qml 2015-10-24 11:39:00 +0000
228@@ -73,7 +73,7 @@
229 */
230
231 import QtQuick 2.4
232-import Ubuntu.Components 1.2
233+import Ubuntu.Components 1.3
234
235 Tabs {
236 id: page
237@@ -164,7 +164,7 @@
238 z: 1
239 width: tipLabel.paintedWidth + units.gu(6)
240 height: bottomEdge.tipHeight + units.gu(1)
241- color: bottomEdgeTipColor //color: "#C9C9C9"
242+ backgroundColor: bottomEdgeTipColor //color: "#C9C9C9"
243
244 Label {
245 id: tipLabel
246
247=== modified file 'shorts/qml/components/FakeHeader.qml'
248--- shorts/qml/components/FakeHeader.qml 2015-07-04 08:38:18 +0000
249+++ shorts/qml/components/FakeHeader.qml 2015-10-24 11:39:00 +0000
250@@ -17,7 +17,7 @@
251 */
252
253 import QtQuick 2.4
254-import Ubuntu.Components 1.2
255+import Ubuntu.Components 1.3
256
257 Column {
258 id: fakeHeader
259
260=== modified file 'shorts/qml/components/GridModeItem.qml'
261--- shorts/qml/components/GridModeItem.qml 2015-07-04 08:38:18 +0000
262+++ shorts/qml/components/GridModeItem.qml 2015-10-24 11:39:00 +0000
263@@ -1,7 +1,7 @@
264 import QtQuick 2.4
265-import Ubuntu.Components 1.2
266-import Ubuntu.Components.ListItems 1.0 as ListItem
267-import Ubuntu.Components.Popups 1.0
268+import Ubuntu.Components 1.3
269+import Ubuntu.Components.ListItems 1.3 as ListItem
270+import Ubuntu.Components.Popups 1.3
271
272 Item {
273 id: gridPage
274
275=== modified file 'shorts/qml/components/ListModeItem.qml'
276--- shorts/qml/components/ListModeItem.qml 2015-10-10 11:24:04 +0000
277+++ shorts/qml/components/ListModeItem.qml 2015-10-24 11:39:00 +0000
278@@ -1,7 +1,7 @@
279 import QtQuick 2.4
280-import Ubuntu.Components 1.2
281-import Ubuntu.Components.ListItems 1.0 as ListItems
282-import Ubuntu.Components.Popups 1.0
283+import Ubuntu.Components 1.3
284+import Ubuntu.Components.ListItems 1.3 as ListItems
285+import Ubuntu.Components.Popups 1.3
286
287 import "../utils/dateutils.js" as DateUtils
288
289
290=== modified file 'shorts/qml/components/NetworkManager.qml'
291--- shorts/qml/components/NetworkManager.qml 2015-07-04 08:38:18 +0000
292+++ shorts/qml/components/NetworkManager.qml 2015-10-24 11:39:00 +0000
293@@ -1,9 +1,9 @@
294 import QtQuick 2.4
295 import QtQuick.XmlListModel 2.0
296
297-import Ubuntu.Components 1.2
298-import Ubuntu.Components.ListItems 1.0 as ListItems
299-import Ubuntu.Components.Popups 1.0
300+import Ubuntu.Components 1.3
301+import Ubuntu.Components.ListItems 1.3 as ListItems
302+import Ubuntu.Components.Popups 1.3
303
304 import "../utils/databasemodule_v2.js" as DB
305 import "../utils/imgSeparator.js" as ImageUtils
306
307=== modified file 'shorts/qml/components/OrganicGrid.qml'
308--- shorts/qml/components/OrganicGrid.qml 2015-10-10 11:24:04 +0000
309+++ shorts/qml/components/OrganicGrid.qml 2015-10-24 11:39:00 +0000
310@@ -1,6 +1,6 @@
311 import QtQuick 2.4
312 import QtGraphicalEffects 1.0
313-import Ubuntu.Components 1.2
314+import Ubuntu.Components 1.3
315
316 Item {
317 id: organicGridRoot
318
319=== modified file 'shorts/qml/components/ReadingOptions.qml'
320--- shorts/qml/components/ReadingOptions.qml 2015-10-10 11:24:04 +0000
321+++ shorts/qml/components/ReadingOptions.qml 2015-10-24 11:39:00 +0000
322@@ -8,9 +8,9 @@
323
324 import QtQuick 2.4
325 import QtQuick.XmlListModel 2.0
326-import Ubuntu.Components 1.2
327-import Ubuntu.Components.ListItems 1.0 as ListItem
328-import Ubuntu.Components.Popups 1.0
329+import Ubuntu.Components 1.3
330+import Ubuntu.Components.ListItems 1.3 as ListItem
331+import Ubuntu.Components.Popups 1.3
332
333 Popover {
334 id: readingOptionsPopover
335
336=== modified file 'shorts/qml/content/SharePage.qml'
337--- shorts/qml/content/SharePage.qml 2015-07-04 08:38:18 +0000
338+++ shorts/qml/content/SharePage.qml 2015-10-24 11:39:00 +0000
339@@ -1,5 +1,5 @@
340 import QtQuick 2.4
341-import Ubuntu.Components 1.2
342+import Ubuntu.Components 1.3
343 import Ubuntu.Content 1.1
344
345 Page {
346
347=== modified file 'shorts/qml/delegates/ArticleFullImg.qml'
348--- shorts/qml/delegates/ArticleFullImg.qml 2015-10-10 11:24:04 +0000
349+++ shorts/qml/delegates/ArticleFullImg.qml 2015-10-24 11:39:00 +0000
350@@ -1,6 +1,6 @@
351 import QtQuick 2.4
352-import Ubuntu.Components 1.2
353-import Ubuntu.Components.ListItems 1.0 as ListItem
354+import Ubuntu.Components 1.3
355+import Ubuntu.Components.ListItems 1.3 as ListItem
356
357 import "../utils/dateutils.js" as DateUtils
358
359
360=== modified file 'shorts/qml/delegates/ArticleOneImgA.qml'
361--- shorts/qml/delegates/ArticleOneImgA.qml 2015-10-10 11:24:04 +0000
362+++ shorts/qml/delegates/ArticleOneImgA.qml 2015-10-24 11:39:00 +0000
363@@ -1,6 +1,6 @@
364 import QtQuick 2.4
365-import Ubuntu.Components 1.2
366-import Ubuntu.Components.ListItems 1.0 as ListItem
367+import Ubuntu.Components 1.3
368+import Ubuntu.Components.ListItems 1.3 as ListItem
369
370 import "../utils/dateutils.js" as DateUtils
371
372
373=== modified file 'shorts/qml/delegates/ArticleTextA.qml'
374--- shorts/qml/delegates/ArticleTextA.qml 2015-10-10 11:24:04 +0000
375+++ shorts/qml/delegates/ArticleTextA.qml 2015-10-24 11:39:00 +0000
376@@ -1,6 +1,6 @@
377 import QtQuick 2.4
378-import Ubuntu.Components 1.2
379-import Ubuntu.Components.ListItems 1.0 as ListItem
380+import Ubuntu.Components 1.3
381+import Ubuntu.Components.ListItems 1.3 as ListItem
382
383 import "../utils/dateutils.js" as DateUtils
384
385
386=== modified file 'shorts/qml/delegates/ArticleTextB.qml'
387--- shorts/qml/delegates/ArticleTextB.qml 2015-10-10 11:24:04 +0000
388+++ shorts/qml/delegates/ArticleTextB.qml 2015-10-24 11:39:00 +0000
389@@ -1,6 +1,6 @@
390 import QtQuick 2.4
391-import Ubuntu.Components 1.2
392-import Ubuntu.Components.ListItems 1.0 as ListItem
393+import Ubuntu.Components 1.3
394+import Ubuntu.Components.ListItems 1.3 as ListItem
395
396 import "../utils/dateutils.js" as DateUtils
397
398
399=== modified file 'shorts/qml/pages/AppendFeedPage.qml'
400--- shorts/qml/pages/AppendFeedPage.qml 2015-10-10 11:24:04 +0000
401+++ shorts/qml/pages/AppendFeedPage.qml 2015-10-24 11:39:00 +0000
402@@ -16,9 +16,9 @@
403
404 import QtQuick 2.4
405 import QtQuick.XmlListModel 2.0
406-import Ubuntu.Components 1.2
407-import Ubuntu.Components.ListItems 1.0 as ListItem
408-import Ubuntu.Components.Popups 1.0
409+import Ubuntu.Components 1.3
410+import Ubuntu.Components.ListItems 1.3 as ListItem
411+import Ubuntu.Components.Popups 1.3
412
413 import "../components"
414 import "../utils/databasemodule_v2.js" as DB
415
416=== modified file 'shorts/qml/pages/ArticleViewPage.qml'
417--- shorts/qml/pages/ArticleViewPage.qml 2015-10-10 11:24:04 +0000
418+++ shorts/qml/pages/ArticleViewPage.qml 2015-10-24 11:39:00 +0000
419@@ -8,9 +8,9 @@
420
421 import QtQuick 2.4
422 import QtQuick.XmlListModel 2.0
423-import Ubuntu.Components 1.2
424-import Ubuntu.Components.ListItems 1.0 as ListItem
425-import Ubuntu.Components.Popups 1.0
426+import Ubuntu.Components 1.3
427+import Ubuntu.Components.ListItems 1.3 as ListItem
428+import Ubuntu.Components.Popups 1.3
429
430 import "../components"
431 import "../utils/dateutils.js" as DateUtils
432
433=== modified file 'shorts/qml/pages/ChooseTopicPage.qml'
434--- shorts/qml/pages/ChooseTopicPage.qml 2015-07-04 08:38:18 +0000
435+++ shorts/qml/pages/ChooseTopicPage.qml 2015-10-24 11:39:00 +0000
436@@ -1,8 +1,8 @@
437 import QtQuick 2.4
438 import QtQuick.XmlListModel 2.0
439-import Ubuntu.Components 1.2
440-import Ubuntu.Components.ListItems 1.0 as ListItem
441-import Ubuntu.Components.Popups 1.0
442+import Ubuntu.Components 1.3
443+import Ubuntu.Components.ListItems 1.3 as ListItem
444+import Ubuntu.Components.Popups 1.3
445
446 import "../utils/databasemodule_v2.js" as DB
447
448
449=== modified file 'shorts/qml/pages/CreateTopicPage.qml'
450--- shorts/qml/pages/CreateTopicPage.qml 2015-07-04 08:38:18 +0000
451+++ shorts/qml/pages/CreateTopicPage.qml 2015-10-24 11:39:00 +0000
452@@ -1,8 +1,8 @@
453 import QtQuick 2.4
454 import QtQuick.XmlListModel 2.0
455-import Ubuntu.Components 1.2
456-import Ubuntu.Components.ListItems 1.0 as ListItem
457-import Ubuntu.Components.Popups 1.0
458+import Ubuntu.Components 1.3
459+import Ubuntu.Components.ListItems 1.3 as ListItem
460+import Ubuntu.Components.Popups 1.3
461
462 import "../utils/databasemodule_v2.js" as DB
463
464
465=== modified file 'shorts/qml/pages/EditFeedPage.qml'
466--- shorts/qml/pages/EditFeedPage.qml 2015-07-04 08:38:18 +0000
467+++ shorts/qml/pages/EditFeedPage.qml 2015-10-24 11:39:00 +0000
468@@ -1,7 +1,7 @@
469 import QtQuick 2.4
470-import Ubuntu.Components 1.2
471-import Ubuntu.Components.ListItems 1.0 as ListItem
472-import Ubuntu.Components.Popups 1.0
473+import Ubuntu.Components 1.3
474+import Ubuntu.Components.ListItems 1.3 as ListItem
475+import Ubuntu.Components.Popups 1.3
476 import Ubuntu.Layouts 1.0
477
478 import "../utils/databasemodule_v2.js" as DB
479@@ -11,7 +11,7 @@
480 objectName: "editfeedpage"
481 title: i18n.tr("Edit Feed")
482 flickable: null/*content*/
483- tools: null
484+// tools: null
485
486 head.actions: [
487 Action {
488@@ -68,7 +68,7 @@
489 }
490
491 function reloadPageContent() {
492- editPage.tools = toolbar
493+// editPage.tools = toolbar
494 }
495
496 Flickable {
497
498=== modified file 'shorts/qml/pages/FeedComponent.qml'
499--- shorts/qml/pages/FeedComponent.qml 2015-07-21 19:42:29 +0000
500+++ shorts/qml/pages/FeedComponent.qml 2015-10-24 11:39:00 +0000
501@@ -1,5 +1,5 @@
502 import QtQuick 2.4
503-import Ubuntu.Components 1.2
504+import Ubuntu.Components 1.3
505 import "../utils/databasemodule_v2.js" as DB
506
507 ListItem {
508
509=== modified file 'shorts/qml/pages/TopicComponent.qml'
510--- shorts/qml/pages/TopicComponent.qml 2015-10-10 11:24:04 +0000
511+++ shorts/qml/pages/TopicComponent.qml 2015-10-24 11:39:00 +0000
512@@ -1,6 +1,6 @@
513 import QtQuick 2.4
514-import Ubuntu.Components 1.2
515-import Ubuntu.Components.ListItems 1.0 as ListItems
516+import Ubuntu.Components 1.3
517+import Ubuntu.Components.ListItems 1.3 as ListItems
518
519 import "../utils/databasemodule_v2.js" as DB
520
521
522=== modified file 'shorts/qml/pages/TopicManagement.qml'
523--- shorts/qml/pages/TopicManagement.qml 2015-07-21 19:42:29 +0000
524+++ shorts/qml/pages/TopicManagement.qml 2015-10-24 11:39:00 +0000
525@@ -1,7 +1,7 @@
526 import QtQuick 2.4
527-import Ubuntu.Components 1.2
528-import Ubuntu.Components.ListItems 1.0 as ListItem
529-import Ubuntu.Components.Popups 1.0
530+import Ubuntu.Components 1.3
531+import Ubuntu.Components.ListItems 1.3 as ListItem
532+import Ubuntu.Components.Popups 1.3
533 import Ubuntu.Layouts 1.0
534
535 import "../utils/databasemodule_v2.js" as DB
536
537=== modified file 'shorts/qml/shorts-app.qml'
538--- shorts/qml/shorts-app.qml 2015-10-10 11:24:04 +0000
539+++ shorts/qml/shorts-app.qml 2015-10-24 11:39:00 +0000
540@@ -1,7 +1,7 @@
541 import QtQuick 2.4
542-import Ubuntu.Components 1.2
543-import Ubuntu.Components.ListItems 1.0 as ListItem
544-import Ubuntu.Components.Popups 1.0
545+import Ubuntu.Components 1.3
546+import Ubuntu.Components.ListItems 1.3 as ListItem
547+import Ubuntu.Components.Popups 1.3
548
549 import "./pages"
550 import "./tabs"
551
552=== modified file 'shorts/qml/tabs/BaseTab.qml'
553--- shorts/qml/tabs/BaseTab.qml 2015-07-04 08:38:18 +0000
554+++ shorts/qml/tabs/BaseTab.qml 2015-10-24 11:39:00 +0000
555@@ -1,7 +1,7 @@
556 import QtQuick 2.4
557-import Ubuntu.Components 1.2
558-import Ubuntu.Components.ListItems 1.0 as ListItem
559-import Ubuntu.Components.Popups 1.0
560+import Ubuntu.Components 1.3
561+import Ubuntu.Components.ListItems 1.3 as ListItem
562+import Ubuntu.Components.Popups 1.3
563
564 import "../components"
565 import "../utils/databasemodule_v2.js" as DB
566
567=== modified file 'shorts/qml/tabs/SavedTab.qml'
568--- shorts/qml/tabs/SavedTab.qml 2015-07-04 08:38:18 +0000
569+++ shorts/qml/tabs/SavedTab.qml 2015-10-24 11:39:00 +0000
570@@ -1,7 +1,7 @@
571 import QtQuick 2.4
572-import Ubuntu.Components 1.2
573-import Ubuntu.Components.ListItems 1.0 as ListItem
574-import Ubuntu.Components.Popups 1.0
575+import Ubuntu.Components 1.3
576+import Ubuntu.Components.ListItems 1.3 as ListItem
577+import Ubuntu.Components.Popups 1.3
578
579 import "../utils/databasemodule_v2.js" as DB
580
581
582=== modified file 'shorts/qml/tabs/ShortsTab.qml'
583--- shorts/qml/tabs/ShortsTab.qml 2015-07-04 08:38:18 +0000
584+++ shorts/qml/tabs/ShortsTab.qml 2015-10-24 11:39:00 +0000
585@@ -1,7 +1,7 @@
586 import QtQuick 2.4
587-import Ubuntu.Components 1.2
588-import Ubuntu.Components.ListItems 1.0 as ListItem
589-import Ubuntu.Components.Popups 1.0
590+import Ubuntu.Components 1.3
591+import Ubuntu.Components.ListItems 1.3 as ListItem
592+import Ubuntu.Components.Popups 1.3
593
594 import "../utils/databasemodule_v2.js" as DB
595
596
597=== modified file 'shorts/qml/tabs/TopicTab.qml'
598--- shorts/qml/tabs/TopicTab.qml 2015-07-04 08:38:18 +0000
599+++ shorts/qml/tabs/TopicTab.qml 2015-10-24 11:39:00 +0000
600@@ -1,7 +1,7 @@
601 import QtQuick 2.4
602-import Ubuntu.Components 1.2
603-import Ubuntu.Components.ListItems 1.0 as ListItem
604-import Ubuntu.Components.Popups 1.0
605+import Ubuntu.Components 1.3
606+import Ubuntu.Components.ListItems 1.3 as ListItem
607+import Ubuntu.Components.Popups 1.3
608
609 import "../utils/databasemodule_v2.js" as DB
610
611
612=== modified file 'shorts/qml/utils/imgSeparator.js'
613--- shorts/qml/utils/imgSeparator.js 2015-07-04 08:38:18 +0000
614+++ shorts/qml/utils/imgSeparator.js 2015-10-24 11:39:00 +0000
615@@ -1,31 +1,25 @@
616-function separate(rss_content) {
617- var image_array = []
618-
619-
620- image_array = rss_content.split("<img")
621- // console.log("SPLIT");
622-
623- image_array.shift() ;
624-
625- for (var i=0; i<image_array.length; i++)
626- {
627- try {
628- image_array[i] = image_array[i].split('src=')[1].split(/"|"/)[1]
629- if (image_array[i].indexOf("//") === 0)
630- image_array[i] = "http:" + image_array[i]
631- }
632- catch(err) {
633- ; // do nothing
634- }
635+.pragma library
636+
637+function separate(content) {
638+ var result = []
639+ var rx = /<img.*?src="(.*?)"/g
640+
641+ var e = rx.exec(content)
642+ while (e) {
643+ // Some simple checks here.
644+ if (e[1].indexOf("http") === 0)
645+ result.push(e[1])
646+
647+ e = rx.exec(content)
648 }
649
650- return image_array
651+ return result
652 }
653
654 function getFirstImage(content) {
655 var imgArr = separate(content)
656
657- if (imgArr.length > 0)
658+ if (imgArr.length)
659 return imgArr[0]
660
661 return null

Subscribers

People subscribed via source and target branches