Revision: 4426
http://vexi.svn.sourceforge.net/vexi/?rev=4426&view=rev
Author: clrg
Date: 2012-07-18 01:07:32 +0000 (Wed, 18 Jul 2012)
Log Message:
-----------
Fixes for textfields
- value, text traps now work
- passfield editing fixes
Modified Paths:
--------------
trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/textfield.t
Modified: trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/textfield.t
===================================================================
--- trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/textfield.t
2012-07-17 01:04:24 UTC (rev 4425)
+++ trunk/org.vexi-vexi.widgets/src_main/org/vexi/lib/widget/textfield.t
2012-07-18 01:07:32 UTC (rev 4426)
@@ -14,22 +14,27 @@
thisbox.enabled = true;
thisbox.password = false;
thisbox.value = "";
- thisbox.v_updatetext = true;
+ thisbox.v_valueput = false;
KeyPressed ++= static.keypressEvent;
password ++= static.passwordWrite;
- text ++= static.textWrite;
value ++= static.valueRead;
value ++= static.valueWrite;
- v_container ++= static.containerWrite;
+ v_ready ++= static.readyWrite;
</ui:box>
- static.containerWrite = function(v) {
+ static.readyWrite = function(v) {
cascade = v;
trapee.v_textbox.v_field = trapee;
- trapee.v_textbox.text ++= static.textWrite;
+ trapee.v_textbox.text ++= static.innerTextWrite;
}
+
+ /** text writes to v_textbox */
+ static.innerTextWrite = function(v) {
+ cascade = v;
+ trapee.v_field.value = v;
+ }
/** fire action or filter key in case of password fields */
static.keypressEvent = function(v) {
@@ -42,79 +47,71 @@
var sPos = edit.getSPos();
var val = trapee.value;
+ if (v == "enter") {
+ trapee.action = true;
+ return;
+
+ } else
if (v == "C-v" or v == "C-V") {
- // handle pasting
- val = val.substring(0, cPos) + vexi.ui.clipboard +
val.substring(cPos, val.length);
- var str = "";
- var l = val.length;
- for (var i=0; l>i; i++) str += '*';
- trapee.v_edit.text = str;
- trapee.value = val;
+ // NB no pasting into a passfield
return;
} else
if (v == "C-c" or v == "C-C") {
- // handle copying
- vexi.ui.clipboard = "";
+ // NB no copying from a passfield
return;
} else
if (v == "C-x" or v == "C-X") {
- // copy/delete
- vexi.ui.clipboard = "";
- trapee.text = "";
- return;
+ // cut only deletes
+ if (edit.select)
+ v = "delete";
+ else return;
}
- if (edit.select) {
+ if (edit.select and ((v.length == 1) or (v == "delete") or (v ==
"back_space"))) {
// delete text matching selected text
if (cPos > sPos) {
- trapee.value = val.substring(0, sPos-1) +
val.substring(cPos, val.length);
- } else {
- trapee.value = val==null?"":val.substring(0, cPos-1) +
val.substring(sPos, val.length);
- }
+ val = val.substring(0, sPos) + val.substring(cPos,
val.length);
+ } else {
+ val = val==null?"":val.substring(0, cPos) +
val.substring(sPos, val.length);
+ }
do_del = false;
}
- val = trapee.value;
- trapee.v_updatetext = false;
+
if (v.length == 1) {
// insert single character
- cascade = '*';
- trapee.value =
+ val =
val==null or val==""
? v
: val.substring(0, cPos) + v + val.substring(cPos,
val.length);
- } else {
- var val = trapee.value;
- //vexi.trace(do_del+", "+cPos+", "+val+", "+text);
- if (v == "back_space") {
- // delete character before cPos
- if (do_del and (cPos > 0)) {
- if (cPos >= val.length) {
- trapee.value = val.substring(0, val.length-1);
- } else {
- trapee.value = val.substring(0, cPos-1) +
val.substring(cPos, val.length);
- }
+ v = '*';
+ } else
+ if (v == "back_space") {
+ // delete character before cPos
+ if (do_del and (cPos > 0)) {
+ if (cPos >= val.length) {
+ val = val.substring(0, val.length-1);
+ } else {
+ val = val.substring(0, cPos-1) + val.substring(cPos,
val.length);
}
-
- } else
- if (v == "delete") {
- // delete character after cPos
- if (do_del and (val.length > cPos)) {
- if (cPos > 0) {
- trapee.value = val.substring(0, cPos) +
val.substring(cPos+1, val.length);
- } else {
- trapee.value = val.substring (1, val.length);
- }
+ }
+
+ } else
+ if (v == "delete") {
+ // delete character after cPos
+ if (do_del and (val.length > cPos)) {
+ if (cPos > 0) {
+ val = val.substring(0, cPos) + val.substring(cPos+1,
val.length);
+ } else {
+ val = val.substring (1, val.length);
}
- } else
- if (v == "enter") {
- trapee.action = true;
}
- // must be done after as not to inadvertently modify cPos
- edit.KeyPressed = v;
}
- trapee.v_updatetext = true;
+ // must be done after as not to inadvertently modify cPos
+ edit.KeyPressed = v;
+ trapee.v_valueput = true;
+ trapee.value = val;
} else {
if (v.length==1 and trapee.forcecase) {
@@ -134,64 +131,55 @@
}
// normal textfield input
cascade = v;
- // value update
- trapee.v_updatetext = false;
- trapee.value = trapee.text;
- trapee.v_updatetext = true;
+ trapee.text = trapee.text;
}
}
/** alternate between password and non-password fields */
static.passwordWrite = function(v) {
- if (!trapee.v_edit || v == trapee.password) {
+ if (v == trapee.password)
return;
- }
cascade = v;
+ const edit = trapee.v_edit;
+
if (v) {
+ edit.text --= static.innerTextWrite;
+ trapee.text ++= passwordTextWrite;
trapee.text = trapee.text;
- var str = "";
- var tvl = trapee.value.length;
- for (var i=0; tvl>i; i++) {
- str += '*';
- }
- trapee.v_edit.text = str;
} else {
+ edit.text ++= static.innerTextWrite;
+ trapee.text --= passwordTextWrite;
trapee.text = trapee.value;
}
}
- /** text writes to v_textbox */
- static.textWrite = function(v) {
- var f = trapee.v_field;
- f.v_updatetext = false;
- if (f.value != v)
- f.value = v;
- f.v_updatetext = true;
- if (f.password) {
- // hide text from user for passfields
- var str = "";
- var l = v==null ? 0 : v.length;
- for (var i=0; l>i; i++) {
- str += '*';
- }
- cascade = str;
- } else {
- cascade = v;
+ /** text writes to on a password field */
+ static.passwordTextWrite = function(v) {
+ if (trapee.v_valueput) {
+ trapee.v_valueput = false;
+ return;
}
+ // hide text from user for passfields
+ var str = "";
+ var l = v==null ? 0 : v.length;
+ for (var i=0; l>i; i++) {
+ str += '*';
+ }
+ cascade = str;
}
/** return the correct value */
- static.valueRead = function() { return trapee.password ? cascade :
trapee.v_edit.text; }
+ static.valueRead = function() {
+ return trapee.password ? cascade : trapee.v_edit.text;
+ }
/** set the text if value is written to */
static.valueWrite = function(v) {
if (trapee.password) {
- if (trapee.v_updatetext and (val != trapee.value)) {
- trapee.text = v;
- }
cascade = v;
+ trapee.text = v;
} else
- if (trapee.v_updatetext) {
+ if (trapee.text != v) {
trapee.text = v;
return;
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Live Security Virtual Conference
Exclusive live event will cover all the ways today's security and
threat landscape has changed and how IT managers can respond. Discussions
will include endpoint security, mobile security and the latest in malware
threats. http://www.accelacomm.com/jaw/sfrnl04242012/114/50122263/
_______________________________________________
Vexi-svn mailing list
Vexi-svn@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/vexi-svn
