feat(ui/modules/Common/Form/ComboBox): remove `getFlattenedModel` function

fc101bd8 · Ronan Abhamon · c88865df · fc101bd8 · fc101bd8
Commit fc101bd8 authored Mar 15, 2017 by Ronan Abhamon
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 6 deletions

ComboBox.js linphone-desktop/ui/modules/Common/Form/ComboBox.js +0 -5

ComboBox.qml linphone-desktop/ui/modules/Common/Form/ComboBox.qml +2 -1

No files found.
--- a/linphone-desktop/ui/modules/Common/Form/ComboBox.js
+++ b/linphone-desktop/ui/modules/Common/Form/ComboBox.js
@@ -25,8 +25,3 @@ function getEntryIcon () {
  var iconRole = comboBox.iconRole
  return (iconRole.length && item.flattenedModel[iconRole]) || ''
 }
-
-function getFlattenedModel () {
-  return comboBox.textRole.length &&
-    (typeof modelData !== 'undefined' ? modelData : model)
-}
--- a/linphone-desktop/ui/modules/Common/Form/ComboBox.qml
+++ b/linphone-desktop/ui/modules/Common/Form/ComboBox.qml
@@ -74,7 +74,8 @@ ComboBox {
  delegate: ItemDelegate {
    id: item

-    readonly property var flattenedModel: Logic.getFlattenedModel()
+    readonly property var flattenedModel: comboBox.textRole.length &&
+      (typeof modelData !== 'undefined' ? modelData : model)

    hoverEnabled: true
    width: comboBox.width