Sailfish port mostly done, bumped version to 6.0

[quandoparte] / application / resources / sailfish / qml / pages / StationListPage.js

diff --git a/application/resources/sailfish/qml/pages/StationListPage.js b/application/resources/sailfish/qml/pages/StationListPage.js
index 858b36e..7a06bc2 100644 (file)
--- a/application/resources/sailfish/qml/pages/StationListPage.js
+++ b/application/resources/sailfish/qml/pages/StationListPage.js
@@ -35,11 +35,16 @@ function highlightSearch(s, color)
 {
     // TODO compile RegExp on change, or find a way to cleanly use
     // stationListProxyModel.filterRegExp
-    if (searchField.text.length) {
-        var r = new RegExp(searchField.text, 'i')
+    if (searchPattern.length) {
+        var r = new RegExp(searchPattern, 'i')
         var match = r.exec(s)
-        return s.replace(r, '<span style="text-decoration:underline;color:' + color + ';">' +
-                         match + '</span>')
+       console.log('s is ' + s);
+       if (match) {
+               return s.replace(r, '<font color="' + color + '">' +
+                               match + '</font>')
+       } else {
+               return s
+       }
     } else {
         return s
     }