Author: pyaschenko
Date: 2010-07-06 09:53:39 -0400 (Tue, 06 Jul 2010)
New Revision: 17739
Modified:
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/ComboBox.js
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/SelectBase.js
Log:
https://jira.jboss.org/browse/RF-8875
Modified:
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/ComboBox.js
===================================================================
---
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/ComboBox.js 2010-07-06
13:07:51 UTC (rev 17738)
+++
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/ComboBox.js 2010-07-06
13:53:39 UTC (rev 17739)
@@ -52,7 +52,7 @@
this.options = {};
// call constructor of parent class
$super.constructor.call(this, componentId+ID.SELECT, fieldId, options);
- $p.attachToDom(componentId);
+ $p.attachToDom.call(this, componentId);
this.componentId = componentId;
this.options = $.extend(this.options, defaultOptions, options);
//this.currentValue = rf.getDomElement(this.fieldId).value;
@@ -84,7 +84,7 @@
};
var onMouseOver = function(event) {
- console && console.log && console.log("mouseOver");
+ //console && console.log && console.log("mouseOver");
var element = event.target;
while (element.parentNode && element.parentNode!=event.currentTarget) {
element = element.parentNode;
@@ -138,7 +138,7 @@
};
// Add new properties and methods
- $.extend(rf.ui.SelectBase.prototype, (function () {
+ $.extend(rf.ui.ComboBox.prototype, (function () {
return {
name:"CompoBox",
destroy: function () {
Modified:
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/SelectBase.js
===================================================================
---
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/SelectBase.js 2010-07-06
13:07:51 UTC (rev 17738)
+++
root/ui-sandbox/inputs/trunk/combobox/src/main/resources/META-INF/resources/script/SelectBase.js 2010-07-06
13:53:39 UTC (rev 17739)
@@ -88,17 +88,17 @@
};
var onSelectMouseDown = function () {
this.isMouseDown = true;
- console && console.log && console.log("onMouseDown");
+ //console && console.log && console.log("onMouseDown");
};
var onSelectMouseUp = function () {
//this.isMouseDown = false;
rf.getDomElement(this.fieldId).focus();
- console && console.log && console.log("onMouseUp");
+ //console && console.log && console.log("onMouseUp");
};
var onButtonShow = function (event) {
this.isMouseDown = true;
- console && console.log && console.log("onButtonShow -
"+this.timeoutId);
+ //console && console.log && console.log("onButtonShow -
"+this.timeoutId);
if (this.timeoutId) {
window.clearTimeout(this.timeoutId);
this.timeoutId = null;
@@ -114,15 +114,15 @@
};
var onFocus = function (event) {
- console && console.log && console.log("onFocus");
+ //console && console.log && console.log("onFocus");
};
var onBlur = function (event) {
- console && console.log && console.log("onBlur");
+ //console && console.log && console.log("onBlur");
if (this.isMouseDown) {
rf.getDomElement(this.fieldId).focus();
this.isMouseDown = false;
- console && console.log && console.log("---------> and
focus");
+ //console && console.log && console.log("---------> and
focus");
} else if (this.isVisible && !this.isMouseDown/*&&
checkOnBlur.call(this, event)*/) {
var _this = this;
this.timeoutId = window.setTimeout(function(){_this.hide();}, 200);