Revision: 4342
http://vexi.svn.sourceforge.net/vexi/?rev=4342&view=rev
Author: clrg
Date: 2012-01-27 00:48:51 +0000 (Fri, 27 Jan 2012)
Log Message:
-----------
Fix number handling in spin after vexi.js.Number changes
Modified Paths:
--------------
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/spin.t
trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/spin.t
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/spin.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/spin.t
2012-01-25 14:44:41 UTC (rev 4341)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/spin.t
2012-01-27 00:48:51 UTC (rev 4342)
@@ -29,15 +29,14 @@
v.action ++= function(a) {
var val = value;
if (val) {
- val = val.number;
value =
minvalue==null
? val-interval
- : vexi.math.max(val-interval, minvalue.number);
+ : vexi.math.max(val-interval, minvalue);
} else if (minvalue != null) {
- value = minvalue.number;
+ value = minvalue;
} else if (maxvalue != null) {
- value = vexi.math.min(0, maxvalue.number);
+ value = vexi.math.min(0, maxvalue);
} else {
value = 0;
}
@@ -53,12 +52,11 @@
v.action ++= function(a) {
var val = value;
if (val) {
- val = val.number;
- value = maxvalue==null ? val+interval :
vexi.math.min(val+interval, maxvalue.number);
+ value = maxvalue==null ? val+interval :
vexi.math.min(val+interval, maxvalue);
} else if (maxvalue != null) {
- value = maxvalue.number;
+ value = maxvalue;
} else if (minvalue != null) {
- value = vexi.math.max(0, minvalue.number);
+ value = vexi.math.max(0, minvalue);
} else {
value = 0;
}
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/spin.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/spin.t
2012-01-25 14:44:41 UTC (rev 4341)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/theme/classic/spin.t
2012-01-27 00:48:51 UTC (rev 4342)
@@ -47,8 +47,8 @@
}
var setMinwidth = function(t) {
- var l1 = t.maxvalue ? t.maxvalue.number.length : 1;
- var l2 = t.minvalue ? t.minvalue.number.length : 1;
+ var l1 = t.maxvalue ? t.maxvalue.length : 1;
+ var l2 = t.minvalue ? t.minvalue.length : 1;
var lv = t.value ? t.value.length : 1;
t.th_viewport.minwidth = t.paddingleft + t.paddingright +
(l1>l2?(l1>lv?l1:lv):(l2>lv?l2:lv)) * vexi.ui.font.width(t.font,
t.fontsize, "0");
@@ -62,8 +62,8 @@
setMinwidth(t);
} else {
t.value --= static.valueWrite;
- var l1 = t.maxvalue ? t.maxvalue.number.length : 1;
- var l2 = t.minvalue ? t.minvalue.number.length : 1;
+ var l1 = t.maxvalue ? t.maxvalue.length : 1;
+ var l2 = t.minvalue ? t.minvalue.length : 1;
t.th_viewport.minwidth = t.paddingleft + t.paddingright +
(l1>l2?l1:l2) * vexi.ui.font.width(t.font, t.fontsize, "0");
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
