Browse Source

qml: avoid using `Array.isArray()`

See QTBUG-112291.
pull/162/head
Fatih Uzunoglu 2 years ago
committed by Steve Lhomme
parent
commit
c7b294d94c
  1. 2
      modules/gui/qt/maininterface/qml/MainDisplay.qml
  2. 2
      modules/gui/qt/playlist/qml/PlaylistListView.qml
  3. 4
      modules/gui/qt/util/qml/FSM.qml
  4. 3
      modules/gui/qt/widgets/qml/ComboBoxExt.qml
  5. 2
      modules/gui/qt/widgets/qml/DragItem.qml
  6. 2
      modules/gui/qt/widgets/qml/PageLoader.qml

2
modules/gui/qt/maininterface/qml/MainDisplay.qml

@ -79,7 +79,7 @@ FocusScope {
MainCtx.hasGridListMode = Qt.binding(() => item.hasGridListMode !== undefined && item.hasGridListMode)
MainCtx.search.available = Qt.binding(() => item.isSearchable !== undefined && item.isSearchable)
MainCtx.sort.model = Qt.binding(function () { return item.sortModel })
MainCtx.sort.available = Qt.binding(function () { return Array.isArray(item.sortModel) && item.sortModel.length > 0 })
MainCtx.sort.available = Qt.binding(function () { return Helpers.isArray(item.sortModel) && item.sortModel.length > 0 })
if (Player.hasVideoOutput && MainCtx.hasEmbededVideo)
_showMiniPlayer = true

2
modules/gui/qt/playlist/qml/PlaylistListView.qml

@ -88,7 +88,7 @@ T.Pane {
// NOTE: Dropping medialibrary content into the queue.
} else if (Helpers.isValidInstanceOf(item, Widgets.DragItem)) {
return item.getSelectedInputItem().then((inputItems) => {
if (!Array.isArray(inputItems) || inputItems.length === 0) {
if (!Helpers.isArray(inputItems) || inputItems.length === 0) {
console.warn("can't convert items to input items");
return
}

4
modules/gui/qt/util/qml/FSM.qml

@ -17,6 +17,8 @@
*****************************************************************************/
import QtQuick
import "qrc:///util/Helpers.js" as Helpers
/**
* @brief a pure QML hierarchical Finite State Machine implementation
*
@ -136,7 +138,7 @@ FSMState {
} else if (transitions === null || transitions.toString().startsWith("FSMState")) {
_changeState(transitions)
return true
} else if (Array.isArray(transitions)) {
} else if (Helpers.isArray(transitions)) {
for (const t of transitions) {
//stop at the first accepted transition
if (_evaluateTransition(state, event, t, ...args))

3
modules/gui/qt/widgets/qml/ComboBoxExt.qml

@ -23,6 +23,7 @@ import org.videolan.vlc 0.1
import "qrc:///style/"
import "qrc:///widgets/" as Widgets
import "qrc:///util/Helpers.js" as Helpers
T.ComboBox {
id: control
@ -59,7 +60,7 @@ T.ComboBox {
padding: VLCStyle.margin_xsmall
leftPadding: control.leftPadding
contentItem: Widgets.ListLabel {
text: control.textRole ? (Array.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
text: control.textRole ? (Helpers.isArray(control.model) ? modelData[control.textRole] : model[control.textRole]) : modelData
color: control.color
elide: Text.ElideRight
verticalAlignment: Text.AlignVCenter

2
modules/gui/qt/widgets/qml/DragItem.qml

@ -164,7 +164,7 @@ Item {
}
function _setInputItems(inputItems) {
if (!Array.isArray(inputItems) || inputItems.length === 0) {
if (!Helpers.isArray(inputItems) || inputItems.length === 0) {
console.warn("can't convert items to input items");
dragItem._inputItems = null
return

2
modules/gui/qt/widgets/qml/PageLoader.qml

@ -137,7 +137,7 @@ StackViewExt {
* @return {boolean}
*/
function isDefaulLoadedForPath(path) {
console.assert(Array.isArray(path))
console.assert(Helpers.isArray(path))
let subPageName
if (path.length === 0) {

Loading…
Cancel
Save