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

[Roman Shchekin]

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

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

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

[Jenkins Bot (ubuntu-core-apps-jenkins-bot)]

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

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

review: Approve (continuous-integration)

[Nicholas Skaggs (nskaggs)]

Let me know if you have further troubles. I'll be fixing the messages jenkins leaves to be a bit saner.

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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)

[Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot)]

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

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

review: Needs Fixing (continuous-integration)

[Joey Chan (qqworini)]

Approved

review: Approve

=== modified file 'manifest.json.4pro'
--- manifest.json.4pro	2015-07-21 19:41:58 +0000
+++ manifest.json.4pro	2015-10-24 13:58:25 +0000
@@ -11,5 +11,5 @@
     },
     "version": "1.0.6",
     "maintainer": "Roman Shchekin <[e-mail]>",
-    "framework": "ubuntu-sdk-15.04"
+    "framework": "ubuntu-sdk-15.04.1-qml"
 }

=== modified file 'shorts/qml/components/BottomEdgeTabs.qml'
--- shorts/qml/components/BottomEdgeTabs.qml	2015-10-24 13:58:24 +0000
+++ shorts/qml/components/BottomEdgeTabs.qml	2015-10-24 13:58:25 +0000
@@ -164,7 +164,7 @@
         z: 1
         width: tipLabel.paintedWidth + units.gu(6)
         height: bottomEdge.tipHeight + units.gu(1)
-        color: bottomEdgeTipColor //color: "#C9C9C9"
+        backgroundColor: bottomEdgeTipColor //color: "#C9C9C9"
 
         Label {
             id: tipLabel

=== modified file 'shorts/qml/utils/imgSeparator.js'
--- shorts/qml/utils/imgSeparator.js	2015-07-04 08:38:18 +0000
+++ shorts/qml/utils/imgSeparator.js	2015-10-24 13:58:25 +0000
@@ -1,31 +1,25 @@
-function separate(rss_content) {
-    var image_array = []
-
-
-    image_array = rss_content.split("<img")
-    // console.log("SPLIT");
-
-    image_array.shift() ;
-
-    for (var i=0; i<image_array.length; i++)
-    {
-        try {
-            image_array[i] = image_array[i].split('src=')[1].split(/"|"/)[1]
-            if (image_array[i].indexOf("//") === 0)
-                image_array[i] = "http:" + image_array[i]
-        }
-        catch(err) {
-            ; // do nothing
-        }
+.pragma library
+
+function separate(content) {
+    var result = []
+    var rx = /<img.*?src="(.*?)"/g
+
+    var e = rx.exec(content)
+    while (e) {
+        // Some simple checks here.
+        if (e[1].indexOf("http") === 0)
+            result.push(e[1])
+
+        e = rx.exec(content)
     }
 
-    return image_array
+    return result
 }
 
 function getFirstImage(content) {
     var imgArr = separate(content)
 
-    if (imgArr.length > 0)
+    if (imgArr.length)
         return imgArr[0]
 
     return null