Author: abelevich
Date: 2008-06-16 09:47:49 -0400 (Mon, 16 Jun 2008)
New Revision: 9056
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
Log:
http://jira.jboss.com/jira/browse/RF-3516
Modified:
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js
===================================================================
---
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-06-16
13:29:48 UTC (rev 9055)
+++
trunk/ui/inplaceInput/src/main/resources/org/richfaces/renderkit/html/scripts/inplaceinput.js 2008-06-16
13:47:49 UTC (rev 9056)
@@ -273,53 +273,57 @@
},
cancel : function(e, value) {
- this.endEditableState();
- if (!value) {
- value = this.valueKeeper.value;
- }
- this.tempValueKeeper.value = value;
- this.currentText = value;
- if ( this.tempValueKeeper.value == "") {
- this.setDefaultText();
+ if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput,
"rich:onviewactivation", {oldValue : this.valueKeeper.value, value :
this.tempValueKeeper.value})) {
+ this.endEditableState();
+ if (!value) {
+ value = this.valueKeeper.value;
+ }
+ this.tempValueKeeper.value = value;
+ this.currentText = value;
+ if ( this.tempValueKeeper.value == "") {
+ this.setDefaultText();
+ }
+ switch (this.prevState) {
+ case Richfaces.InplaceInput.STATES[0] :
+ this.startViewState();
+ break;
+ case Richfaces.InplaceInput.STATES[2] :
+ this.startChangedState();
+ break;
+ }
+
+ if (this.events.onviewactivated) {
+ this.inplaceInput.fire("rich:onviewactivated", {oldValue :
this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
}
- switch (this.prevState) {
- case Richfaces.InplaceInput.STATES[0] :
- this.startViewState();
- break;
- case Richfaces.InplaceInput.STATES[2] :
- this.startChangedState();
- break;
- }
},
save : function() {
- var userValue = this.tempValueKeeper.value;
- var currentText = userValue;
- this.saveValue(userValue);
+ if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput,
"rich:onviewactivation", {oldValue : this.valueKeeper.value, value :
this.tempValueKeeper.value})) {
+ var userValue = this.tempValueKeeper.value;
+ this.saveValue(userValue);
+ if (this.events.onviewactivated) {
+ this.inplaceInput.fire("rich:onviewactivated", {oldValue :
this.valueKeeper.value, value : this.tempValueKeeper.value});
+ }
+ }
},
saveValue : function(userValue) {
var value = this.valueKeeper.value;
- if (this.invokeEvent(this.events.onviewactivation, this.inplaceInput,
"rich:onviewactivation", {oldValue : this.valueKeeper.value, value :
this.tempValueKeeper.value})) {
- this.endEditableState();
+ this.endEditableState();
- if (userValue == "") {
- this.setDefaultText();
- this.valueKeeper.value = "";
- } else {
- this.currentText = userValue;
- this.valueKeeper.value = userValue;
- }
+ if (userValue == "") {
+ this.setDefaultText();
+ this.valueKeeper.value = "";
+ } else {
+ this.currentText = userValue;
+ this.valueKeeper.value = userValue;
+ }
- if (userValue != this.value) {
- this.startChangedState();
- } else {
- this.startViewState();
- }
-
- if (this.events.onviewactivated) {
- this.inplaceInput.fire("rich:onviewactivated", {oldValue :
this.valueKeeper.value, value : this.tempValueKeeper.value});
- }
+ if (userValue != this.value) {
+ this.startChangedState();
+ } else {
+ this.startViewState();
}
},