Revision: 2107
http://vexi.svn.sourceforge.net/vexi/?rev=2107&view=rev
Author: clrg
Date: 2007-09-01 05:04:20 -0700 (Sat, 01 Sep 2007)
Log Message:
-----------
Clean up selectable focusing/selecting code
Modified Paths:
--------------
trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
Modified: trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
===================================================================
--- trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
2007-09-01 12:03:15 UTC (rev 2106)
+++ trunk/widgets/org.vexi.widgets/src/org/vexi/lib/role/selectable.t
2007-09-01 12:04:20 UTC (rev 2107)
@@ -73,9 +73,9 @@
{
ns = trapee.groupref.members.after(ns);
if (!ns) ns = trapee.groupref.members.first;
- } while (!ns.enabled and ns != trapee);
+ } while (!ns.focusable and ns != trapee);
- return ns.enabled ? ns : trapee;
+ return ns;
}
/** find the previous selectable member */
@@ -86,9 +86,9 @@
{
ps = trapee.groupref.members.before(ps);
if (!ps) ps = trapee.groupref.members.last;
- } while (!ps.enabled and ps != trapee);
+ } while (!ps.focusable and ps != trapee);
- return ps.enabled ? ps : trapee;
+ return ps;
}
/** selected read trap */
@@ -121,6 +121,7 @@
/** clickable integration */
static.actionFunc = function(v)
{
+ vexi.log.info("action: "+trapee.text);
if (trapee.enabled)
trapee.selected = true;
cascade = v;
@@ -129,14 +130,8 @@
/** integration with clickable and focusable */
static.focusableFunc = function()
{
- return cascade and (trapee.primed or
- (trapee.groupref
- ? (trapee.groupref.selected
- ? trapee.selected
- : ((trapee.groupref.firstMember == trapee)
- ? true
- : false))
- : true));
+ return cascade and (trapee.primed or trapee.selected or
!trapee.groupref or
+ (!trapee.groupref.selected and trapee.groupref.firstMember ==
trapee));
}
/** selection by keyboard navigation for selectable groups */
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
