From 0196d9a220e4bdd989539f55b4d5736d189410d4 Mon Sep 17 00:00:00 2001 From: Dirk Hohndel Date: Sun, 22 Jan 2017 17:25:49 -0800 Subject: QML UI: correctly test if there are multiple buddies The JS string function search returns the position of the string you search for and -1 if that string isn't found. Also, search allows regular expression, indexOf does just a string match. So let's use that as it is much faster. See issue #168 Signed-off-by: Dirk Hohndel --- mobile-widgets/qml/DiveDetails.qml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml index be342886d..de8c29e40 100644 --- a/mobile-widgets/qml/DiveDetails.qml +++ b/mobile-widgets/qml/DiveDetails.qml @@ -156,7 +156,7 @@ Kirigami.Page { airtemp = diveDetailsListView.currentItem.modelData.dive.airTemp watertemp = diveDetailsListView.currentItem.modelData.dive.waterTemp suitIndex = diveDetailsListView.currentItem.modelData.dive.suitList.indexOf(diveDetailsListView.currentItem.modelData.dive.suit) - if (diveDetailsListView.currentItem.modelData.dive.buddy.search(",")) { + if (diveDetailsListView.currentItem.modelData.dive.buddy.indexOf(",") > 0) { buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf("Multiple Buddies"); } else { buddyIndex = diveDetailsListView.currentItem.modelData.dive.buddyList.indexOf(diveDetailsListView.currentItem.modelData.dive.buddy) -- cgit v1.2.3-70-g09d2