changeset 958:3aaac251a5af

Pseudo-sort working with filters
author Adam Chlipala <adamc@hcoop.net>
date Thu, 17 Sep 2009 19:15:10 -0400
parents 2831be2daf2e
children 53b9aeac676c
files demo/more/dlist.ur demo/more/grid.ur
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/demo/more/dlist.ur	Thu Sep 17 19:01:04 2009 -0400
+++ b/demo/more/dlist.ur	Thu Sep 17 19:15:10 2009 -0400
@@ -162,8 +162,12 @@
                                                                  None => headPos dl
                                                                | Some prev => tailPos prev tl tlTop
                                                in
+                                                   b <- r.Filter v;
                                                    tl' <- signal tl;
-                                                   listOut (Some tl) tl' ((v, pos) :: acc)
+                                                   listOut (Some tl) tl' (if b then
+                                                                              (v, pos) :: acc
+                                                                          else
+                                                                              acc)
                                                end
                                    in
                                        listOut None hd []
--- a/demo/more/grid.ur	Thu Sep 17 19:01:04 2009 -0400
+++ b/demo/more/grid.ur	Thu Sep 17 19:15:10 2009 -0400
@@ -218,7 +218,7 @@
                                               return (previous && this))
                                           (fn _ => return True)
                                           [_] M.folder M.cols grid.Cols grid.Filters row,
-                       Sort = return (Some (fn _ _ => return False))}
+                       Sort = return (Some (fn _ _ => return True))}
                       grid.Rows}
 
             <dyn signal={rows <- Dlist.foldl (fn row => Monad.mapR2 [aggregateMeta M.row] [id] [id]