Revision: 3991
http://vexi.svn.sourceforge.net/vexi/?rev=3991&view=rev
Author: clrg
Date: 2011-01-15 01:07:06 +0000 (Sat, 15 Jan 2011)
Log Message:
-----------
Tabs->spaces + syntax
Modified Paths:
--------------
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/pad.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/menuitem.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/option.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/tree.t
trunk/org.vexi-vexi.widgets/src_main/vexi/util/common.t
trunk/org.vexi-vexi.widgets/src_main/vexi/util/date.t
trunk/org.vexi-vexi.widgets/src_main/vexi/util/decimal.t
trunk/org.vexi-vexi.widgets/src_main/vexi/util/shreadboxes.t
trunk/org.vexi-vexi.widgets/src_main/vexi/util/sync.t
trunk/org.vexi-vexi.widgets/src_main/vexi/widget/radio.t
trunk/org.vexi-vexi.widgets/src_poke/profile/colorpalette.t
trunk/org.vexi-vexi.widgets/src_poke/widgets/numfield.t
trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_proxy.t
trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_remove.t
trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_simple.t
trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t
trunk/org.vexi-vexi.widgets/src_test/test/util/decimal.t
trunk/org.vexi-vexi.widgets/src_test/test/util/sync.t
trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t
trunk/org.vexi-vexi.widgets/src_test/test/widget/label.t
trunk/org.vexi-vexi.widgets/src_test/test/widget/numfield.t
trunk/org.vexi-vexi.widgets/src_test/test/widget/scrollbar_page.t
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/pad.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/pad.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/layout/pad.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -21,8 +21,9 @@
// set v_fillbox to box containing padding
// (must be done before setting v_content)
- if (thisbox.v_fillbox==null)
+ if (thisbox.v_fillbox==null) {
thisbox.v_fillbox = v_content ? v_content : thisbox;
+ }
thisbox.v_content = $content;
thisbox.v_textbox = $content;
@@ -102,7 +103,7 @@
} else {
// invalid args
- throw "Invalid number of values for padding: "+p.length+" from
'"+v+"'";
+ throw "Invalid number of values for padding: "+p.length+" from
'"+v+"'";
}
}
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/text/edit.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -88,7 +88,7 @@
<ui:box align="topleft" orient="vertical" vshrink="true"
highlightcolor="white" highlightfill="darkblue">
-
+
// use vars for encapsulation and efficiency
var blockargs = [thisbox, thisbox];
@@ -1741,7 +1741,7 @@
// special case for first line
var b = thisbox[0];
if (b == null)
- return;
+ return;
var n = b.numchildren;
for (var j=0; n>j; j++) {
ret[++k] = b[j].text;
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/menuitem.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/menuitem.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/menuitem.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -21,20 +21,26 @@
/** simply set the icon; expects a stream */
static.iconWrite = function(v) {
cascade = v;
- if (trapee.th_icon) trapee.th_icon.fill = v;
+ if (trapee.th_icon) {
+ trapee.th_icon.fill = v;
+ }
}
/** become active menuitem on Enter */
static.enterEvent = function(v) {
var t = trapee;
- if (t.enabled and !t.selected) t.selected = true;
+ if (t.enabled and !t.selected) {
+ t.selected = true;
+ }
cascade = v;
}
/** deselect (become inactive) if active */
static.leaveEvent = function(v) {
var t = trapee;
- if (t.selected) t.selected = false;
+ if (t.selected) {
+ t.selected = false;
+ }
cascade = v;
}
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/option.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/option.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/option.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -48,8 +48,8 @@
</ui:box>
static.selecteditemRead = function() {
- return trapee.v_listgroup?.selected;
- };
+ return trapee.v_listgroup?.selected;
+ }
static.listgroupWrite = function(v) {
var g = trapee.v_listgroup;
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/tree.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/tree.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/tree.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -45,7 +45,7 @@
thisbox.v_childrenWrite = function(c) {
if (c and c.v_is_tree) {
- c.parent = thisbox;
+ c.parent = thisbox;
if (!v_group) {
// we have no group
if (c.v_group) {
Modified: trunk/org.vexi-vexi.widgets/src_main/vexi/util/common.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/vexi/util/common.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/vexi/util/common.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -13,11 +13,11 @@
static.nullIllegal = function(v) { if (v==null) throw "null value illegal
for '"+trapname+"'"; cascade = v; }
static.readOnly = function(v) { throw "property '"+trapname+"' is read
only"; return; }
static.lazyProp = function(f) {
- return function(){
- var v = f();
- trapee[trapname] = v;
- trapee[trapname] --= callee;
- return v;
+ return function() {
+ var v = f();
+ trapee[trapname] = v;
+ trapee[trapname] --= callee;
+ return v;
};
};
Modified: trunk/org.vexi-vexi.widgets/src_main/vexi/util/date.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/vexi/util/date.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/vexi/util/date.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -77,9 +77,14 @@
/** date read trap */
static.dateRead = function() {
- if (!trapee.day or !trapee.month or !trapee.year) return null;
- try { return vexi.date(trapee.year, trapee.month-1, trapee.day); }
- catch (e) { return null; }
+ if (!trapee.day or !trapee.month or !trapee.year) {
+ return null;
+ }
+ try {
+ return vexi.date(trapee.year, trapee.month-1, trapee.day);
+ } catch (e) {
+ return null;
+ }
}
/** date write trap */
@@ -88,7 +93,9 @@
trapee.year = v ? v.getFullYear() : null;
trapee.month = v ? v.getMonth()+1 : null;
trapee.day = v ? v.getDate() : null;
- } catch (e) { throw "Unsupported date value: "+v+" (type:
"+typeof(v)+")"; }
+ } catch (e) {
+ throw "Unsupported date value: "+v+" (type: "+typeof(v)+")";
+ }
return;
}
@@ -97,11 +104,11 @@
if (v != null) {
if (trapee.allowzeroday and v == 0) {
;
- } else {
+ } else {
if (typeof(v)=="string") {
v = vexi.string.parseInt(v);
}
- // NOTE: the order of the monthday +=/-= and month ++/--
+ // NOTE: the order of the monthday +=/-= and month ++/--
// is important and dependent on days surplus / shortage
while (v>trapee.monthdays) {
v -= trapee.monthdays;
@@ -122,18 +129,18 @@
/** get the name of a month */
static.getMonthName = function(m) {
switch (m) {
- case 1: return "January";
- case 2: return "February";
- case 3: return "March";
- case 4: return "April";
- case 5: return "May";
- case 6: return "June";
- case 7: return "July";
- case 8: return "August";
- case 9: return "September";
- case 10: return "October";
- case 11: return "November";
- case 12: return "December";
+ case 1: return "January";
+ case 2: return "February";
+ case 3: return "March";
+ case 4: return "April";
+ case 5: return "May";
+ case 6: return "June";
+ case 7: return "July";
+ case 8: return "August";
+ case 9: return "September";
+ case 10: return "October";
+ case 11: return "November";
+ case 12: return "December";
}
return null;
}
@@ -228,16 +235,18 @@
o = new .date();
}
// establish how many characters for each part
- var m, m1, m2;
+ var mc = format.charAt(0);
+ var m1, m2, mn;
var m3 = format.length;
- for (var i=0; m3>i; i++) {
- if (m!=format.charAt(i)) {
- if (m) {
+ for (var i=1; m3>i; i++) {
+ mn = format.charAt(i);
+ if (mc!=mn) {
+ if (mc) {
if (!m1) m1 = i;
else if (!m2) m2 = i;
else break;
}
- m = format.charAt(i);
+ mc = mn;
}
}
// parse string into 3 number parts
Modified: trunk/org.vexi-vexi.widgets/src_main/vexi/util/decimal.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/vexi/util/decimal.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/vexi/util/decimal.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -51,9 +51,9 @@
break;
}
case "0":
- if (i==0 and (length==1 || v.charAt(1)==".")) {
- break;
- }
+ if (i==0 and (length==1 || v.charAt(1)==".")) {
+ break;
+ }
if (!hadnumber) {
return false;
}
@@ -208,10 +208,10 @@
};
thisobj.negate = function(){
- if (isNegative()) {
- return new decimal(value.substring(1));
+ if (isNegative()) {
+ return new decimal(value.substring(1));
} else {
- return new decimal("-"+value);
+ return new decimal("-"+value);
}
};
Modified: trunk/org.vexi-vexi.widgets/src_main/vexi/util/shreadboxes.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/vexi/util/shreadboxes.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/vexi/util/shreadboxes.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -11,17 +11,17 @@
* Calls an optional unload() function to allow cleanup of any traps set
by the object.
*/
static.shreadBoxes = function(abox) {
- if (abox.numchildren > 1) {
- for (var b = abox.numchildren-1; b >= 0; b--) {
- if (abox[b] != null)
- shreadBoxes(abox[b]);
- }
- }
- if (abox.unload != null)
- abox.unload();
- for (var b in abox)
- abox[b] = null;
- abox.clear();
+ if (abox.numchildren > 1) {
+ for (var b = abox.numchildren-1; b >= 0; b--) {
+ if (abox[b] != null)
+ shreadBoxes(abox[b]);
+ }
+ }
+ if (abox.unload != null)
+ abox.unload();
+ for (var b in abox)
+ abox[b] = null;
+ abox.clear();
}
<ui:box />
Modified: trunk/org.vexi-vexi.widgets/src_main/vexi/util/sync.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/vexi/util/sync.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/vexi/util/sync.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -25,15 +25,15 @@
</desc>
</meta:doc>
-// var track = function(o,k,o2,k2){
-// var key = "__sync__"+k+"_"+o2+"_"+k2;
-// if(o[key]) throw "!";
-// else o[key] = true;
-// };
-
- static.forward = function(a,b,ka,kb){
- if(!kb) kb = ka;
- var fromA = false;
+// var track = function(o,k,o2,k2){
+// var key = "__sync__"+k+"_"+o2+"_"+k2;
+// if(o[key]) throw "!";
+// else o[key] = true;
+// };
+
+ static.forward = function(a, b, ka, kb) {
+ if (!kb) kb = ka;
+ var fromA = false;
var writeA = function(v) {
cascade = v;
@@ -46,15 +46,15 @@
a[ka] ++= writeA;
};
-
- static.sync = function(a,b,ka,kb){
- if(!kb) kb = ka;
+
+ static.sync = function(a, b, ka, kb) {
+ if (!kb) kb = ka;
var fromA = false;
var fromB = false;
var writeA = function(v) {
cascade = v;
- if(fromB) return;
+ if (fromB) return;
fromA = true;
try { b[kb] = v; }
finally { fromA = false; }
@@ -62,7 +62,7 @@
var writeB = function(v) {
cascade = v;
- if(fromA) return;
+ if (fromA) return;
fromB = true;
try { a[ka] = v; }
finally { fromB = false; }
@@ -73,10 +73,10 @@
// CHECK - maybe do this better
// track(a,ka,b,kb);
// track(b,kb,a,ka);
- return [a,b,ka,kb,writeA,writeB];
+ return [a, b, ka, kb, writeA, writeB];
};
- static.unsync = function(linkobj){
+ static.unsync = function(linkobj) {
var a = linkobj[0];
var b = linkobj[1];
var ka = linkobj[2];
@@ -88,14 +88,14 @@
};
// almost identical
- static.syncTransform = function(a,b,ka,kb,a2b,b2a){
- if(!kb) kb = ka;
+ static.syncTransform = function(a, b, ka, kb, a2b, b2a) {
+ if (!kb) kb = ka;
var fromA = false;
var fromB = false;
var writeA = function(v) {
cascade = v;
- if(fromB) return;
+ if (fromB) return;
fromA = true;
try { b[kb] = a2b(v); }
finally { fromA = false; }
@@ -103,7 +103,7 @@
var writeB = function(v) {
cascade = v;
- if(fromA) return;
+ if (fromA) return;
fromB = true;
try { a[ka] = b2a(v); }
finally { fromB = false; }
@@ -111,10 +111,8 @@
a[ka] ++= writeA;
b[kb] ++= writeB;
- return [a,b,ka,kb,writeA,writeB];
- };
+ return [a, b, ka, kb, writeA, writeB];
+ };
-
<js:Object />
-
</vexi>
Modified: trunk/org.vexi-vexi.widgets/src_main/vexi/widget/radio.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/vexi/widget/radio.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_main/vexi/widget/radio.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -12,12 +12,12 @@
To group radios together, simply wrap a group of radio buttons in
a selectgroup.
The old, more complex ways is:
- Assign the group of one to the group of another:
+ Assign the group of one to the group of another:
- $radio2.group = $radio1.group;
+ $radio2.group = $radio1.group;
- Groups are generated on demand, so you want to assign
- using the first widget in the group for correct order.
+ Groups are generated on demand, so you want to assign
+ using the first widget in the group for correct order.
Trap 'selected' to know when the widget is selected.
</usage>
Modified: trunk/org.vexi-vexi.widgets/src_poke/profile/colorpalette.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_poke/profile/colorpalette.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_poke/profile/colorpalette.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -38,11 +38,11 @@
thisbox.width ++= function(v) {
cascade = v;
var renderStart = vexi.date().getTime();
- // threads normally run after rendering
- vexi.thread = function() {
- var renderEnd = vexi.date().getTime();
- vexi.log.info("rendered "+total+" boxes at
"+width+"x"+height+" in "+(renderEnd-renderStart)+"ms");
- }
+ // threads normally run after rendering
+ vexi.thread = function() {
+ var renderEnd = vexi.date().getTime();
+ vexi.log.info("rendered "+total+" boxes at
"+width+"x"+height+" in "+(renderEnd-renderStart)+"ms");
+ }
}
vexi.ui.frame = thisbox;
Modified: trunk/org.vexi-vexi.widgets/src_poke/widgets/numfield.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_poke/widgets/numfield.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_poke/widgets/numfield.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -3,33 +3,35 @@
<ui:box orient="vertical">
<ui:box shrink="true">
<w:check id="restrict" text="restrict"/>
- <w:check id="three_dp" text="3dp"/>
- <w:check id="positive" text="positive"/>
+ <w:check id="three_dp" text="3dp"/>
+ <w:check id="positive" text="positive"/>
</ui:box>
<w:numfield id="numfield" />
- $restrict.selected ++= function(v){
- cascade = v;
- $positive.enabled = $three_dp.enabled = v;
- $numfield.restrict = v;
+
+ $restrict.selected ++= function(v) {
+ cascade = v;
+ $positive.enabled = $three_dp.enabled = v;
+ $numfield.restrict = v;
};
- $positive.selected ++= function(v){
- cascade = v;
- $numfield.minvalue = v?"0":null;
+ $positive.selected ++= function(v) {
+ cascade = v;
+ $numfield.minvalue = v?"0":null;
};
- $three_dp.selected ++= function(v){
- cascade = v;
- $numfield.decimalPlaces = v?3:null;
+ $three_dp.selected ++= function(v) {
+ cascade = v;
+ $numfield.decimalPlaces = v?3:null;
};
$restrict.selected = false;
- $numfield.value ++= function(v){
- cascade = v;
- vexi.log.info(v);
+ $numfield.value ++= function(v) {
+ cascade = v;
+ vexi.log.info(v);
};
vexi.ui.frame = thisbox;
+
</ui:box>
-</vexi>
\ No newline at end of file
+</vexi>
Modified: trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_columns.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -10,32 +10,32 @@
<ui:box>
var vunit = vexi..vexi.test.vunit;
-
- var newBox = function(n, c, r, f) {
- var b = vexi.box;
- b.fill = f;
- b.name = n;
- b.colspan = c;
- b.rowspan = r;
- return b;
- };
-
- var assertWidth = function(w, b) {
- vexi.log.info(b.name+".width: "+b.width);
- vunit..assertEquals(w, b.width);
- };
-
- var assertHeight = function(h, b) {
- vexi.log.info(b.name+".height: "+b.height);
- vunit..assertEquals(h, b.height);
- };
-
- var assertSlot = function(c, r, b) {
- vexi.log.info(b.name+": "+b.col+"+"+b.colspan+" -
"+b.row+"+"+b.rowspan);
- vunit..assertEquals(c, b.col);
- vunit..assertEquals(r, b.row);
- };
-
+
+ var newBox = function(n, c, r, f) {
+ var b = vexi.box;
+ b.fill = f;
+ b.name = n;
+ b.colspan = c;
+ b.rowspan = r;
+ return b;
+ };
+
+ var assertWidth = function(w, b) {
+ vexi.log.info(b.name+".width: "+b.width);
+ vunit..assertEquals(w, b.width);
+ };
+
+ var assertHeight = function(h, b) {
+ vexi.log.info(b.name+".height: "+b.height);
+ vunit..assertEquals(h, b.height);
+ };
+
+ var assertSlot = function(c, r, b) {
+ vexi.log.info(b.name+": "+b.col+"+"+b.colspan+" -
"+b.row+"+"+b.rowspan);
+ vunit..assertEquals(c, b.col);
+ vunit..assertEquals(r, b.row);
+ };
+
/*
AB \
CD } both runs
Modified: trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_proxy.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_proxy.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_proxy.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -6,16 +6,16 @@
<ui:box>
- var g = .grid(vexi.box);
- var p = .gridproxy(vexi.box);
- var a = vexi.box;
- var b = vexi.box;
- p[0] = a;
- p[1] = b;
- g[0] = p;
- assert(g.numchildren==2);
- assert(g.indexof(a)==0);
- assert(g.indexof(b)==1);
- assert(g.indexof(p)==-1);
+ var g = .grid(vexi.box);
+ var p = .gridproxy(vexi.box);
+ var a = vexi.box;
+ var b = vexi.box;
+ p[0] = a;
+ p[1] = b;
+ g[0] = p;
+ assert(g.numchildren==2);
+ assert(g.indexof(a)==0);
+ assert(g.indexof(b)==1);
+ assert(g.indexof(p)==-1);
</ui:box>
</vexi>
\ No newline at end of file
Modified: trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_remove.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_remove.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_remove.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -9,7 +9,7 @@
var vunit = vexi..vexi.test.vunit;
- var b = vexi.box;
+ var b = vexi.box;
b.visible ++= function() { return true; };
.grid(b);
var c = vexi.box;
Modified: trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_simple.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_simple.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/layout/grid_simple.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -6,30 +6,30 @@
<ui:box>
var vunit = vexi..vexi.test.vunit;
- var newBox = function(n, c, r, f) {
- var b = vexi.box;
- b.fill = f;
- b.name = n;
- b.colspan = c;
- b.rowspan = r;
- return b;
- };
-
- var assertWidth = function(w, b) {
- vexi.log.info(b.name+".width: "+b.width);
- vunit..assertEquals(w, b.width);
- };
-
- var assertHeight = function(h, b) {
- vexi.log.info(b.name+".height: "+b.height);
- vunit..assertEquals(h, b.height);
- };
-
- var assertSlot = function(c, r, b) {
- vexi.log.info(b.name+": "+b.col+"+"+b.colspan+" -
"+b.row+"+"+b.rowspan);
- vunit..assertEquals(c, b.col);
- vunit..assertEquals(r, b.row);
- };
+ var newBox = function(n, c, r, f) {
+ var b = vexi.box;
+ b.fill = f;
+ b.name = n;
+ b.colspan = c;
+ b.rowspan = r;
+ return b;
+ };
+
+ var assertWidth = function(w, b) {
+ vexi.log.info(b.name+".width: "+b.width);
+ vunit..assertEquals(w, b.width);
+ };
+
+ var assertHeight = function(h, b) {
+ vexi.log.info(b.name+".height: "+b.height);
+ vunit..assertEquals(h, b.height);
+ };
+
+ var assertSlot = function(c, r, b) {
+ vexi.log.info(b.name+": "+b.col+"+"+b.colspan+" -
"+b.row+"+"+b.rowspan);
+ vunit..assertEquals(c, b.col);
+ vunit..assertEquals(r, b.row);
+ };
/*
Modified: trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/layout/testgrid.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -4,22 +4,22 @@
<ui:box>
var vunit = vexi..vexi.test.vunit;
- var newBox = function(w,h){
- var b = vexi.box;
- b.minwidth=w;
- b.minheight=h;
- return b;
- };
-
- var assertSize = function(w,h,b){
- vunit..assertEquals(w,b.width);
- vunit..assertEquals(h,b.height);
- };
-
- var assertLoc = function(x,y,b){
- vunit..assertEquals(x,b.x);
- vunit..assertEquals(y,b.y);
- };
+ var newBox = function(w,h){
+ var b = vexi.box;
+ b.minwidth=w;
+ b.minheight=h;
+ return b;
+ };
+
+ var assertSize = function(w,h,b){
+ vunit..assertEquals(w,b.width);
+ vunit..assertEquals(h,b.height);
+ };
+
+ var assertLoc = function(x,y,b){
+ vunit..assertEquals(x,b.x);
+ vunit..assertEquals(y,b.y);
+ };
/*
Modified: trunk/org.vexi-vexi.widgets/src_test/test/util/decimal.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/util/decimal.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/util/decimal.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -6,97 +6,97 @@
var asserteq = .test.vunit..assertEquals;
- var suite = {};
- suite.testInsert1 = function(){
- var d = new decimal("");
- asserteq("",d.string);
- d=d.attemptInsert(0,"0");
- d=d.attemptInsert(1,".");
- d=d.attemptInsert(2,"9");
- d=d.attemptInsert(3,"9");
- asserteq("0.99",d.string);
- d=d.attemptInsert(4,"p");
- asserteq(null,d);
-
- d = new decimal(".99");
- asserteq(".99",d.string);
- d = d.attemptInsert(0,"0");
- asserteq("0.99",d.string);
- };
-
- suite.testInsertNegative = function(){
- var d = new decimal("");
- asserteq("",d.string);
- d = d.attemptInsert(0,"-");
- asserteq("-",d.string);
- d = d.attemptInsert(0,"-");
- asserteq(null,d);
- d = new decimal(".12");
- d = d.attemptInsert(0,"-");
- asserteq("-.12",d.string);
- d = d.attemptInsert(0,"-");
- asserteq(null,d);
- };
-
- var assertDecimalGT = function(a,b){
- var dA = new decimal(a);
- var dB = new decimal(b);
- assert(dA.compareTo(dB)>0);
- assert(0>dB.compareTo(dA));
- };
-
- var assertDecimalEQ = function(a,b){
- var dA = new decimal(a);
- var dB = new decimal(b);
- assert(dA.compareTo(dB)==0);
- assert(0==dB.compareTo(dA));
- };
-
- suite.testCompare = function(){
- assertDecimalGT("3","2");
- assertDecimalGT("10","0.01");
- assertDecimalGT("0.1","0.01");
- assertDecimalGT("-10","-11");
- assertDecimalGT(".1","0.01");
- assertDecimalGT("-0.1","-.2");
- assertDecimalGT("-.1","-0.2");
-
- assertDecimalEQ(".","0");
- assertDecimalEQ("-.","0");
- assertDecimalEQ(".1","0.1");
- };
-
- static.assertCanonical = function(s,expect){
- var d = new decimal(s);
- asserteq(expect,d.canonical);
- };
-
- suite.testCanonical = function(){
- assertCanonical("1","1");
- assertCanonical("123","123");
- assertCanonical("123.456","123.456");
- assertCanonical("0.1","0.1");
- assertCanonical(".1","0.1");
- assertCanonical("-0.1","-0.1");
- assertCanonical("-.1","-0.1");
- assertCanonical("-0","0");
-
- assertCanonical(".","0");
- assertCanonical("-.","0");
-
- };
-
- suite.testAssertValid = function(){
- var d = new decimal("0.123");
- d.assertValid();
- };
+ var suite = {};
+ suite.testInsert1 = function(){
+ var d = new decimal("");
+ asserteq("",d.string);
+ d=d.attemptInsert(0,"0");
+ d=d.attemptInsert(1,".");
+ d=d.attemptInsert(2,"9");
+ d=d.attemptInsert(3,"9");
+ asserteq("0.99",d.string);
+ d=d.attemptInsert(4,"p");
+ asserteq(null,d);
+
+ d = new decimal(".99");
+ asserteq(".99",d.string);
+ d = d.attemptInsert(0,"0");
+ asserteq("0.99",d.string);
+ };
+
+ suite.testInsertNegative = function(){
+ var d = new decimal("");
+ asserteq("",d.string);
+ d = d.attemptInsert(0,"-");
+ asserteq("-",d.string);
+ d = d.attemptInsert(0,"-");
+ asserteq(null,d);
+ d = new decimal(".12");
+ d = d.attemptInsert(0,"-");
+ asserteq("-.12",d.string);
+ d = d.attemptInsert(0,"-");
+ asserteq(null,d);
+ };
+
+ var assertDecimalGT = function(a,b){
+ var dA = new decimal(a);
+ var dB = new decimal(b);
+ assert(dA.compareTo(dB)>0);
+ assert(0>dB.compareTo(dA));
+ };
+
+ var assertDecimalEQ = function(a,b){
+ var dA = new decimal(a);
+ var dB = new decimal(b);
+ assert(dA.compareTo(dB)==0);
+ assert(0==dB.compareTo(dA));
+ };
+
+ suite.testCompare = function(){
+ assertDecimalGT("3","2");
+ assertDecimalGT("10","0.01");
+ assertDecimalGT("0.1","0.01");
+ assertDecimalGT("-10","-11");
+ assertDecimalGT(".1","0.01");
+ assertDecimalGT("-0.1","-.2");
+ assertDecimalGT("-.1","-0.2");
+
+ assertDecimalEQ(".","0");
+ assertDecimalEQ("-.","0");
+ assertDecimalEQ(".1","0.1");
+ };
+
+ static.assertCanonical = function(s,expect){
+ var d = new decimal(s);
+ asserteq(expect,d.canonical);
+ };
+
+ suite.testCanonical = function(){
+ assertCanonical("1","1");
+ assertCanonical("123","123");
+ assertCanonical("123.456","123.456");
+ assertCanonical("0.1","0.1");
+ assertCanonical(".1","0.1");
+ assertCanonical("-0.1","-0.1");
+ assertCanonical("-.1","-0.1");
+ assertCanonical("-0","0");
+
+ assertCanonical(".","0");
+ assertCanonical("-.","0");
+
+ };
+
+ suite.testAssertValid = function(){
+ var d = new decimal("0.123");
+ d.assertValid();
+ };
- static.test = suite;
+ static.test = suite;
- static.assertDecimalGT = assertDecimalGT;
- static.assertDecimalEQ = assertDecimalEQ;
+ static.assertDecimalGT = assertDecimalGT;
+ static.assertDecimalEQ = assertDecimalEQ;
<ui:box>
- //static.assertDecimalEQ(".","0");
+ //static.assertDecimalEQ(".","0");
//static.assertDecimalGT("3","2");
static.test.testAssertValid();
Modified: trunk/org.vexi-vexi.widgets/src_test/test/util/sync.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/util/sync.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/util/sync.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -9,26 +9,26 @@
{ // normal
var a = {x: "a"};
- var b = {y: "b"};
- var token = sync..sync(a, b, "x", "y");
-
- assertEq("a",a.x);
- assertEq("b",b.y);
- a.x = "c";
- assertEq("c",a.x);
- assertEq("c",b.y);
-
- sync..unsync(token);
- a.x = "d";
- assertEq("d",a.x);
- assertEq("c",b.y);
+ var b = {y: "b"};
+ var token = sync..sync(a, b, "x", "y");
+
+ assertEq("a",a.x);
+ assertEq("b",b.y);
+ a.x = "c";
+ assertEq("c",a.x);
+ assertEq("c",b.y);
+
+ sync..unsync(token);
+ a.x = "d";
+ assertEq("d",a.x);
+ assertEq("c",b.y);
}
{ // transform
var a = {x: "a.b"};
- var b = {y: []};
- var a2b = function(s){ return s.split("."); };
- var b2a = function(a){ return a.join("."); };
+ var b = {y: []};
+ var a2b = function(s){ return s.split("."); };
+ var b2a = function(a){ return a.join("."); };
var token = sync..syncTransform(a, b, "x", "y", a2b, b2a);
assertObjEq("a.b",a.x);
@@ -40,7 +40,7 @@
sync..unsync(token);
a.x = "e.f";
- assertObjEq(["c","d"],b.y);
+ assertObjEq(["c","d"],b.y);
}
</ui:box>
</vexi>
\ No newline at end of file
Modified: trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/widget/combo.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -6,9 +6,9 @@
<surface>
var vunit = vexi..vexi.test.vunit;
- var assertEq = vunit..assertEq;
- var assertExceptionThrown = vunit..assertExceptionThrown;
-
+ var assertEq = vunit..assertEq;
+ var assertExceptionThrown = vunit..assertExceptionThrown;
+
var b = .combo(vexi.box);
var i1 = .item(vexi.box); i1.text="An A"; i1.value="A";
var i2 = .item(vexi.box); i2.text="B";
Modified: trunk/org.vexi-vexi.widgets/src_test/test/widget/label.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/widget/label.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/widget/label.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -6,9 +6,9 @@
<ui:box>
var vunit = vexi..vexi.test.vunit;
- var assertEq = vunit..assertEq;
- var assertExceptionThrown = vunit..assertExceptionThrown;
-
+ var assertEq = vunit..assertEq;
+ var assertExceptionThrown = vunit..assertExceptionThrown;
+
var b = .label(vexi.box);
b.textcolor = "#444444";
assertEq("#444444",b.textcolor);
Modified: trunk/org.vexi-vexi.widgets/src_test/test/widget/numfield.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/widget/numfield.t 2011-01-15
00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/widget/numfield.t 2011-01-15
01:07:06 UTC (rev 3991)
@@ -6,13 +6,13 @@
<surface>
var vunit = vexi..vexi.test.vunit;
- var assertEq = vunit..assertEq;
- var assertExceptionThrown = vunit..assertExceptionThrown;
-
- /**
- * basic numfield value write tests
- */
-
+ var assertEq = vunit..assertEq;
+ var assertExceptionThrown = vunit..assertExceptionThrown;
+
+ /**
+ * basic numfield value write tests
+ */
+
var b = .numfield(vexi.box);
b.decimalPlaces = 2;
b.value = "1.00";
Modified: trunk/org.vexi-vexi.widgets/src_test/test/widget/scrollbar_page.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_test/test/widget/scrollbar_page.t
2011-01-15 00:49:20 UTC (rev 3990)
+++ trunk/org.vexi-vexi.widgets/src_test/test/widget/scrollbar_page.t
2011-01-15 01:07:06 UTC (rev 3991)
@@ -4,43 +4,43 @@
<ui:box>
- var vunit = vexi..vexi.test.vunit;
+ var vunit = vexi..vexi.test.vunit;
- var scrollbar = util..create(.scrollbar, {orient:"vertical",
minthumbsize:8});
- // required or it thinks its not displayed
- scrollbar.surface ++= function(){return true;};
- var viewport = .table..new_fakeviewport();
- var track = util..create(null, {height:250});
- scrollbar.th_track = track;
- var thumb = vexi.box;
- scrollbar.th_thumb = thumb;
-
- viewport.height = 300;
- viewport[0].height = 200000;
- scrollbar.viewport = viewport;
- scrollbar.lineshift = 20;
- scrollbar.pageshift ++= function() { if (viewport) return 0.9 *
(viewport.height); };
-
- var scrollAssert = function(up){
- var y = viewport[0].y;
- track.action = true;
- vexi.log.info(y + " -> " + viewport[0].y);
- if(up) vunit..assertApproxEquals( scrollbar.pageshift,
viewport[0].y-y, 20);
- else vunit..assertApproxEquals( scrollbar.pageshift,
y-viewport[0].y, 20);
- };
-
- // spoof mouse
- var mousepos = 10;
- track.mouse ++= function(){return {y:mousepos};};
- // spoof mouse held down
- track.repeat = true;
-
- viewport[0].y = -100000;
- for(var i=0; 10>i; i++)scrollAssert(true);
-
- mousepos = 260;
- track.repeat = true;
- for(var i=0; 10>i; i++)scrollAssert(false);
+ var scrollbar = util..create(.scrollbar, {orient:"vertical",
minthumbsize:8});
+ // required or it thinks its not displayed
+ scrollbar.surface ++= function(){return true;};
+ var viewport = .table..new_fakeviewport();
+ var track = util..create(null, {height:250});
+ scrollbar.th_track = track;
+ var thumb = vexi.box;
+ scrollbar.th_thumb = thumb;
+
+ viewport.height = 300;
+ viewport[0].height = 200000;
+ scrollbar.viewport = viewport;
+ scrollbar.lineshift = 20;
+ scrollbar.pageshift ++= function() { if (viewport) return 0.9 *
(viewport.height); };
+
+ var scrollAssert = function(up){
+ var y = viewport[0].y;
+ track.action = true;
+ vexi.log.info(y + " -> " + viewport[0].y);
+ if(up) vunit..assertApproxEquals( scrollbar.pageshift,
viewport[0].y-y, 20);
+ else vunit..assertApproxEquals( scrollbar.pageshift,
y-viewport[0].y, 20);
+ };
+ // spoof mouse
+ var mousepos = 10;
+ track.mouse ++= function(){return {y:mousepos};};
+ // spoof mouse held down
+ track.repeat = true;
+
+ viewport[0].y = -100000;
+ for(var i=0; 10>i; i++)scrollAssert(true);
+
+ mousepos = 260;
+ track.repeat = true;
+ for(var i=0; 10>i; i++)scrollAssert(false);
+
</ui:box>
</vexi>
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
