Revision: 1951
http://svn.sourceforge.net/vexi/?rev=1951&view=rev
Author: clrg
Date: 2007-07-08 13:10:32 -0700 (Sun, 08 Jul 2007)
Log Message:
-----------
Fix missing cascade / returns in trap functions
Modified Paths:
--------------
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/clickable.t
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupable.t
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t
widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/lazytable.t
widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/clickable.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/clickable.t
2007-07-08 18:04:46 UTC (rev 1950)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/clickable.t
2007-07-08 20:10:32 UTC (rev 1951)
@@ -83,11 +83,13 @@
// clean up trap
trapee._Release1 --= callee;
}
+ cascade = v;
}
/** initialise as normal state */
surface ++= function(v)
{
+ cascade = v;
normal = true;
surface --= callee;
}
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupable.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupable.t
2007-07-08 18:04:46 UTC (rev 1950)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupable.t
2007-07-08 20:10:32 UTC (rev 1951)
@@ -78,7 +78,11 @@
}
/** write trap on KeyPressed event */
- static.keyPressFunc = function(v) { if (v == "escape") trapee.popdown =
true; }
+ static.keyPressFunc = function(v)
+ {
+ cascade = v;
+ if (v == "escape") trapee.popdown = true;
+ }
/** write trap to popdown th_popbox */
static.popdownFunc = function(v)
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
2007-07-08 18:04:46 UTC (rev 1950)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/role/popupmanager.t
2007-07-08 20:10:32 UTC (rev 1951)
@@ -20,8 +20,8 @@
var reqtimes = {}; // pop request times
/** used to track surface_x/y changes */
- var syncXPos = function(v) { popforegs[trapee.popgroup].x = v; }
- var syncYPos = function(v) { popforegs[trapee.popgroup].y = v; }
+ var syncXPos = function(v) { cascade = v; popforegs[trapee.popgroup].x
= v; }
+ var syncYPos = function(v) { cascade = v; popforegs[trapee.popgroup].y
= v; }
/** private function to pop down box 'v' */
var popDown = function(v)
@@ -161,6 +161,7 @@
/** popdown when surface loses focus unless told to otherwise */
surface.Focused ++= function(v)
{
+ cascade = v;
if (!v)
{
for (var key in popgroups)
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t
2007-07-08 18:04:46 UTC (rev 1950)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/text/default.t
2007-07-08 20:10:32 UTC (rev 1951)
@@ -90,7 +90,7 @@
$edit.height ++= function(v) { cascade = v; minheight = v; }
- thisbox.cursorcolor ++= function(v) { $cursor.fill = v; }
+ thisbox.cursorcolor ++= function(v) { cascade = v; $cursor.fill = v; }
vexi..vexi.util.redirect..addRedirect(thisbox, $edit, "multiline");
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/lazytable.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/lazytable.t
2007-07-08 18:04:46 UTC (rev 1950)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/lib/widget/lazytable.t
2007-07-08 20:10:32 UTC (rev 1951)
@@ -187,7 +187,8 @@
}
/** set the row template to use for new rows in loadData() */
- thisbox.setRowTemplate = function(t) {
+ thisbox.setRowTemplate = function(t)
+ {
rowtemplate = t;
var instance = t(vexi.box);
instance.forcereflow();
@@ -197,6 +198,8 @@
/** sort by column when activated */
var actionFunc = function(v)
{
+ cascade = v;
+
// relieve previous column
if (sortby and sortby != trapee)
{
@@ -222,6 +225,7 @@
/** match column widths with column headers */
var colwidthFunc = function(v)
{
+ cascade = v;
var ind = th_head.indexof(trapee);
if (th_foot and th_foot[ind]) th_foot[ind].width = v;
for (var i=0; th_body.numchildren > i; i++) th_body[i][ind].width
= v;
@@ -256,11 +260,13 @@
});
/** start the timer to do delayed column width settings */
- var widthFunc = function(v) { delayedColumnResize(); }
+ var widthFunc = function(v) { cascade = v; delayedColumnResize(); }
/** set up table components */
thisbox.th_content ++= function(v)
{
+ cascade = v;
+
/** set up table components */
v.Children ++= function(c)
{
Modified: widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
2007-07-08 18:04:46 UTC (rev 1950)
+++ widgets/trunk/org.vexi.widgets/src/org/vexi/theme/win2k/column.t
2007-07-08 20:10:32 UTC (rev 1951)
@@ -28,6 +28,7 @@
$sort.fill = null;
$sort.minwidth = 0;
}
+ cascade = v;
}
$content.height ++= function(v) { $b.minheight = v + 3; cascade = v; }
Modified: widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
===================================================================
--- widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
2007-07-08 18:04:46 UTC (rev 1950)
+++ widgets/trunk/org.vexi.widgets/src/vexi/util/date/monthview.t
2007-07-08 20:10:32 UTC (rev 1951)
@@ -306,6 +306,7 @@
tmpmonth = month;
tmpyear = year + 1;
setDates();
+ cascade = v;
}
/** drop tmp values on display */
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 DB2 Express
Download DB2 Express C - the FREE version of DB2 express and take
control of your XML. No limits. Just data. Click to get it now.
http://sourceforge.net/powerbar/db2/
_______________________________________________
Vexi-svn mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/vexi-svn
