From: Mike S. <ms...@us...> - 2006-12-04 15:09:53
|
Update of /cvsroot/wonder/Wonder/Ajax/Ajax/Sources/er/ajax In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv18166/Sources/er/ajax Modified Files: AjaxInPlace.java Log Message: Cornelius' patch to support "always on" editing Index: AjaxInPlace.java =================================================================== RCS file: /cvsroot/wonder/Wonder/Ajax/Ajax/Sources/er/ajax/AjaxInPlace.java,v retrieving revision 1.19 retrieving revision 1.20 diff -C2 -d -r1.19 -r1.20 *** AjaxInPlace.java 4 Dec 2006 15:03:57 -0000 1.19 --- AjaxInPlace.java 4 Dec 2006 15:09:45 -0000 1.20 *************** *** 16,23 **** * * <pre> ! * <webobject name = "ExampleInPlace"> ! * <webobject name = "View">View: <webobject name = "Value"/></webobject> ! * <webobject name = "Edit">Edit: <webobject name = "ValueField"/></webobject> ! * </webobject> * </pre> * --- 16,23 ---- * * <pre> ! * <webobject name = "ExampleInPlace"> ! * <webobject name = "View">View: <webobject name = "Value"/></webobject> ! * <webobject name = "Edit">Edit: <webobject name = "ValueField"/></webobject> ! * </webobject> * </pre> * *************** *** 25,46 **** * * <pre> ! * ExampleInPlace : AjaxInPlace { ! * } ! * ! * View : ERXWOTemplate { ! * templateName = "view"; ! * } ! * ! * Value : WOString { ! * value = value; ! * } ! * ! * Edit : ERXWOTemplate { ! * templateName = "edit"; ! * } ! * ! * ValueField : WOTextField { ! * value = value; ! * } * </pre> * --- 25,46 ---- * * <pre> ! * ExampleInPlace : AjaxInPlace { ! * } ! * ! * View : ERXWOTemplate { ! * templateName = "view"; ! * } ! * ! * Value : WOString { ! * value = value; ! * } ! * ! * Edit : ERXWOTemplate { ! * templateName = "edit"; ! * } ! * ! * ValueField : WOTextField { ! * value = value; ! * } * </pre> * *************** *** 194,197 **** --- 194,200 ---- public void setEditing(boolean editing) { + if (canSetValueForBinding("editing")) { + setValueForBinding(Boolean.valueOf(editing), "editing"); + } _editing = editing; } *************** *** 199,204 **** public WOActionResults startEditing() { if (canEdit()) { ! _editing = true; ! setValueForBinding(Boolean.TRUE, "editing"); WOActionResults results = (WOActionResults) valueForBinding("editAction"); } --- 202,206 ---- public WOActionResults startEditing() { if (canEdit()) { ! setEditing(true); WOActionResults results = (WOActionResults) valueForBinding("editAction"); } *************** *** 217,222 **** // check to see if we can save after firing the action (in case validation failed or something) if (canSave) { ! _editing = false; ! setValueForBinding(Boolean.FALSE, "editing"); } } --- 219,223 ---- // check to see if we can save after firing the action (in case validation failed or something) if (canSave) { ! setEditing(false); } } *************** *** 227,232 **** public WOActionResults cancel() { WOActionResults results = (WOActionResults) valueForBinding("cancelAction"); ! _editing = false; ! setValueForBinding(Boolean.FALSE, "editing"); // ignore results return null; --- 228,232 ---- public WOActionResults cancel() { WOActionResults results = (WOActionResults) valueForBinding("cancelAction"); ! setEditing(false); // ignore results return null; |