V 0.8.0: Merge branch 'development'

[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 7a06bc2..306c3c7 100644 (file)
--- a/application/resources/sailfish/qml/pages/StationListPage.js
+++ b/application/resources/sailfish/qml/pages/StationListPage.js
@@ -19,13 +19,10 @@ function loadStation(name, code)
         stationListPage.stationView = view
         pageStack.push(view)
 
-        /*
-            XXX Ugliness ahead! Changing the name triggers the station
-            schedule to be fetched. So any extra data (the code specifically)
-            must be set before changing the name.
-         */
-        if (code !== undefined) view.code = code
-        view.name = name
+        if (code === undefined) {
+            code = ""
+        }
+        schedule.fetch(name, code)
     }
     else
         console.log('Cannot load component: ' + component.errorString());