diff --git a/basis/models/illusion/illusion.factor b/basis/models/illusion/illusion.factor index 1b3a297c5b..00169792a9 100644 --- a/basis/models/illusion/illusion.factor +++ b/basis/models/illusion/illusion.factor @@ -5,7 +5,9 @@ TUPLE: illusion < arrow ; : ( model quot -- illusion ) illusion new V{ } clone >>connections V{ } clone >>dependencies 0 >>ref - swap >>quot over >>model [ add-dependency ] keep dup activate-model ; + swap >>quot over >>model [ add-dependency ] keep ; + +: ( model quot -- illusion ) dup activate-model ; : backtalk ( value object -- ) [ quot>> [undo] call( a -- b ) ] [ model>> ] bi set-model ; diff --git a/basis/ui/gadgets/tables/tables.factor b/basis/ui/gadgets/tables/tables.factor index e3ffa9237d..c0b792785d 100644 --- a/basis/ui/gadgets/tables/tables.factor +++ b/basis/ui/gadgets/tables/tables.factor @@ -56,11 +56,11 @@ SLOT: selected-value SLOT: selected-index SLOT: selected-index* M: table selected-value>> selected-values>> [ in>out ] ; -M: table (>>selected-value) [ [ out>in ] ] dip (>>selected-values) ; +M: table (>>selected-value) [ [ out>in ] ] dip (>>selected-values) ; M: table selected-index>> selected-indices>> in>out ; M: table (>>selected-index) [ out>in ] dip (>>selected-indices) ; M: table selected-index*>> selected-indices*>> [ in>out ] ; -M: table (>>selected-index*) [ [ out>in ] ] dip (>>selected-indices*) ; +M: table (>>selected-index*) [ [ out>in ] ] dip (>>selected-indices*) ; IN: ui.gadgets.tables : push-selected-index ( table n -- table ) 2dup swap selected-indices>> index