Commit cfa43f03 authored by Alexandre Delanoë's avatar Alexandre Delanoë

Merge branch 'dev' into dev-merge

parents 7e195b15 d7dc9798
...@@ -200,7 +200,7 @@ toHtml p@{ asyncTasks ...@@ -200,7 +200,7 @@ toHtml p@{ asyncTasks
let withId (NTree (LNode {id: id'}) _) = id' let withId (NTree (LNode {id: id'}) _) = id'
pure $ H.li {} $ pure $ H.li {} $
[ nodeMainSpan (isLeaf ary) [ nodeMainSpan (A.null ary)
{ id { id
, dispatch: pAction , dispatch: pAction
, folderOpen , folderOpen
...@@ -224,8 +224,6 @@ toHtml p@{ asyncTasks ...@@ -224,8 +224,6 @@ toHtml p@{ asyncTasks
} }
) )
isLeaf :: Array FTree -> Boolean
isLeaf = not <<< A.null
type ChildNodesProps = type ChildNodesProps =
( asyncTasks :: R.State GAT.Storage ( asyncTasks :: R.State GAT.Storage
......
...@@ -128,7 +128,8 @@ nodeMainSpan isLeaf p@{ dispatch, folderOpen, frontends, handed, session } = R.c ...@@ -128,7 +128,8 @@ nodeMainSpan isLeaf p@{ dispatch, folderOpen, frontends, handed, session } = R.c
chevronIcon isLeaf handed' nodeType folderOpen'@(open /\ _) = chevronIcon isLeaf handed' nodeType folderOpen'@(open /\ _) =
if isLeaf if isLeaf
then then H.div {} []
else
H.a { className: "chevron-icon" H.a { className: "chevron-icon"
, onClick: R2.effToggler folderOpen' , onClick: R2.effToggler folderOpen'
} }
...@@ -139,7 +140,6 @@ nodeMainSpan isLeaf p@{ dispatch, folderOpen, frontends, handed, session } = R.c ...@@ -139,7 +140,6 @@ nodeMainSpan isLeaf p@{ dispatch, folderOpen, frontends, handed, session } = R.c
then "fa fa-chevron-right" then "fa fa-chevron-right"
else "fa fa-chevron-left" else "fa fa-chevron-left"
} [] ] } [] ]
else H.div {} []
folderIcon nodeType folderOpen'@(open /\ _) = folderIcon nodeType folderOpen'@(open /\ _) =
H.a { className: "folder-icon" H.a { className: "folder-icon"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment