[richfaces-svn-commits] JBoss Rich Faces SVN: r19480 - branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces.
Author: abelevich
Date: 2010-10-06 10:32:26 -0400 (Wed, 06 Oct 2010)
New Revision: 19480
Modified:
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
Log:
move flags defenition to the constructor
Modified:
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js
===================================================================
---
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-06
14:01:49 UTC (rev 19479)
+++
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceBase.js 2010-10-06
14:32:26 UTC (rev 19480)
@@ -39,6 +39,9 @@
this.editContainer = $(document.getElementById(options.editContainer));
this.element.bind(this.editEvent, $.proxy(this.__editHandler, this));
+
+ this.isSaved = false;
+ this.useDefaultLabel = false;
if(this.showControls) {
this.okbtn = $(document.getElementById(options.okbtn));
@@ -52,9 +55,7 @@
var $super = rf.ui.InplaceBase.$super;
$.extend(rf.ui.InplaceBase.prototype, ( function () {
- var isSaved = false;
- var useDefaultLabel = false;
-
+
return {
getName: function() {
},
@@ -89,10 +90,10 @@
this.setLabel(value);
} else {
this.setLabel(this.defaultLabel);
- useDefaultLabel = true;
+ this.useDefaultLabel = true;
}
- isSaved = true;
+ this.isSaved = true;
this.__applyChangedStyles();
this.__hide();
@@ -108,16 +109,16 @@
cancel: function(){
var text = "";
- if(!useDefaultLabel) {
+ if(!this.useDefaultLabel) {
text = this.getLabel()
}
this.setValue(text);
- isSaved = true;
+ this.isSaved = true;
this.__hide();
},
isValueSaved: function() {
- return isSaved;
+ return this.isSaved;
},
__saveValue: function(value) {
@@ -139,7 +140,7 @@
},
__editHandler: function(e) {
- isSaved = false;
+ this.isSaved = false;
this.editContainer.removeClass(this.noneCss);
this.__show();
},
Modified:
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js
===================================================================
---
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-06
14:01:49 UTC (rev 19479)
+++
branches/RF-8992/ui/input/ui/src/main/resources/META-INF/resources/org.richfaces/inplaceSelect.js 2010-10-06
14:32:26 UTC (rev 19480)
@@ -7,6 +7,8 @@
this.select = new rf.ui.Select(options.listCord, this, options);
this.selectItems = options.selectItems;
this.selValueInput = $(document.getElementById(options.selValueInput));
+ this.openPopup = false;
+
}
rf.ui.InplaceInput.extend(rf.ui.InplaceSelect);
@@ -15,8 +17,6 @@
var $super = rf.ui.InplaceSelect.$super;
$.extend(rf.ui.InplaceSelect.prototype, ( function () {
- var openPopup = false;
-
return{
name : "inplaceSelect",
@@ -29,12 +29,12 @@
},
onshow: function() {
- if(openPopup) {
+ if(this.openPopup) {
this.select.show();
}
- if(!openPopup) {
- openPopup = true;
+ if(!this.openPopup) {
+ this.openPopup = true;
}
$super.onshow.call(this);
@@ -42,7 +42,7 @@
onhide: function() {
this.select.hide();
- openPopup = false;
+ this.openPopup = false;
},
processItem: function(event, element) {
@@ -79,7 +79,7 @@
}
}
},
-
+
__blurHandler: function(e) {
var target = $(e.originalEvent.explicitOriginalTarget);
if(!this.__isPopupList(target)) {