Author: F.antonov Date: 2007-03-22 11:32:15 -0400 (Thu, 22 Mar 2007) New Revision: 120 Modified: trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js Log: Fix for bug RFA-321. Modified: trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js =================================================================== --- trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-03-22 15:31:50 UTC (rev 119) +++ trunk/richfaces/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2007-03-22 15:32:15 UTC (rev 120) @@ -18,7 +18,6 @@ this.classes.handleSelected = " " + handleSelectedClass; this.table = this.findTableForTrack(this.track); - //this.table.onmouseup = this.fireEditEvent.bindAsEventListener(this); this.input.value = this.options.sliderValue; @@ -216,8 +215,8 @@ this.handle.className = this.classes.arrowSelected + this.classes.base + this.classes.handleSelected; if (this.options.currValue){ this.tip.style.display = "block"; - } - this.fireEditEvent("mousedown"); + } + Richfaces.createEvent("mousedown", this.mainTable, "MouseEvents", null).fire(); this.active = true; var handle = Event.element(event); var pointer = Event.pointerX(event); @@ -262,80 +261,30 @@ this.handle.className = this.classes.arrow + this.classes.base; if(this.active && this.dragging) { this.active = false; - this.dragging = false; - this.fireEditEvent("mouseup"); + this.dragging = false; + Richfaces.createEvent("mouseup", this.mainTable, "MouseEvents", null).fire(); Event.stop(event); } if (RichFaces.navigatorType() != "MSIE") - this.fireEditEvent("change"); + Richfaces.createEvent("change", this.input, "HTMLEvents", null).fire(); }, fireClickIfNeeded: function(event){ -/* alert('navigatorType is ' + navigator.userAgent - + "\n" + "prevMouseDownEvent target is " + this.prevMouseDownEvent.target - + "\n" + "event target is " + event.target - + "\n" + "target.tagName is " + event.target.tagName - + "\n" + "appCodeName is " + navigator.appCodeName - + "\n" + "appName is " + navigator.appName - + "\n" + "appVersion is " + navigator.appVersion - + "\n" + "navigatorType is " + RichFaces.navigatorType() - + "\n" + "OperaVersion is " + RichFaces.getOperaVersion() - + "\n" + "bool operator return " + (RichFaces.getOperaVersion() && RichFaces.getOperaVersion() < 9.0 && event.target.tagName.toLowerCase() == "td")); -*/ - if ((this.prevMouseDownEvent.target != event.target && - //this.prevMouseDownEvent.screenX == event.clientX && - //this.prevMouseDownEvent.screenY == event.clientY && - RichFaces.navigatorType() == "FF") - || (RichFaces.getOperaVersion() && RichFaces.getOperaVersion() < 9.0 && - //|| ((this.isOpera8() && - //|| ((this.isOpera8algoritm2() && - event.target.tagName.toLowerCase() != "div")) { - if( document.createEvent ) { - var evObj = document.createEvent("MouseEvents"); - evObj.initEvent( "click", true, false ); - //evObj.initMouseEvent("click", true, false, window, - // event.detail, event.screenX, event.screenY, event.clientX, event.clientY, - // event.ctrlKey, event.altKey, event.shiftKey, event.metaKey, event.button, null); - this.mainTable.dispatchEvent(evObj); - } - } - }, - -/* isOpera8: function(){ - var operaPosition = navigator.userAgent.toLowerCase().indexOf("opera"); - if (operaPosition >= 0 && - navigator.userAgent.charAt(operaPosition + 6) == "8"){ - return true; + if ((this.prevMouseDownEvent.target != event.target + && RichFaces.navigatorType() == "FF") + || (RichFaces.getOperaVersion() + && RichFaces.getOperaVersion() < 9.0 + && event.target.tagName.toLowerCase() != "div")) { + Richfaces.createEvent("click", this.mainTable, "MouseEvents", null).fire(); } - return false; }, - isOpera8algoritm2: function(){ - if (window.opera) { - var index = navigator.userAgent.toLowerCase().indexOf("opera"); - if (parseInt(navigator.userAgent.toLowerCase().substring(index+6)) == 8) { - return true; - } - } - return false; - }, -*/ isValueChanged : function(){ var ret =this.prevValue != this.value this.prevValue = this.value; return ret; }, - fireEditEvent: function(e){ - if( document.createEvent ) { - var evObj = document.createEvent('HTMLEvents'); - evObj.initEvent( e, true, false ); - this.input.dispatchEvent(evObj); - } else if( document.createEventObject ) { - this.input.fireEvent('on' + e || "change"); - } - }, - inputChange: function(e) { this.editInFocus = false; if (isNaN(Number(this.input.value))){