Author: abelevich Date: 2007-11-16 14:06:12 -0500 (Fri, 16 Nov 2007) New Revision: 4048 Modified: trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx Log: add clientErrorMessage, fix RF-1370 Modified: trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml =================================================================== --- trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2007-11-16 18:04:31 UTC (rev 4047) +++ trunk/ui/inputnumber-spinner/src/main/config/component/inputNumberSpinner.xml 2007-11-16 19:06:12 UTC (rev 4048) @@ -114,6 +114,12 @@ <description>HTML: a script expression; event fires whenever an JavaScript error occurs</description> <defaultvalue><![CDATA[""]]></defaultvalue> </property> + <property> + <name>clientErrorMessage</name> + <classname>java.lang.String</classname> + <description>client error message</description> + <defaultvalue><![CDATA[""]]></defaultvalue> + </property> <property> <name>maxlength</name> <classname>int</classname> Modified: trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js =================================================================== --- trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js 2007-11-16 18:04:31 UTC (rev 4047) +++ trunk/ui/inputnumber-spinner/src/main/resources/org/richfaces/renderkit/html/script/SpinnerScript.js 2007-11-16 19:06:12 UTC (rev 4048) @@ -27,7 +27,7 @@ var edit = this._getDirectChildrenByTag(this.content,'INPUT')[0]; this.upClick = new Function(events.onup + ";return true;").bindAsEventListener(edit); this.downClick = new Function(events.ondown + ";return true;").bindAsEventListener(edit); - this.error = new Function(events.onerr + ";return true;").bindAsEventListener(edit); + this.error = new Function("event","clientErrorMessage",events.onerr + ";return true;").bind(edit); this.data = data; this.max = null; @@ -57,9 +57,10 @@ this.controls.edit.value = this.max; } } else { - this.error(); + this.error(e,this.options.clientErrorMsg); this.controls.fireEditEvent("error"); this.controls.edit.value = this.max; + return true; } } } @@ -79,13 +80,15 @@ this.controls.edit.value = this.max; } } else { - this.error(); + this.error(e,this.options.clientErrorMsg); this.controls.fireEditEvent("error"); this.controls.edit.value = this.min; + return true; } } } } + return false; }, roundFloat: function(x){ @@ -192,22 +195,26 @@ if (e.preventDefault) { e.preventDefault(); ; } - this.spinner.switchItems('up'); + var isError = this.spinner.switchItems('up'); this.spinner.upClick(); - window.document.onmouseup = this.mouseUp.bindAsEventListener(this); - this.mousedown=true; - this.timer = setTimeout(this.continueUpClick.bind(this), 750); + if(!isError){ + window.document.onmouseup = this.mouseUp.bindAsEventListener(this); + this.mousedown=true; + this.timer = setTimeout(this.continueUpClick.bind(this), 750); + } }, downClick: function(e){ if (e.preventDefault) { e.preventDefault(); ; } - this.spinner.switchItems('down'); + var isError = this.spinner.switchItems('down'); this.spinner.downClick(); - window.document.onmouseup = this.mouseUp.bindAsEventListener(this); - this.mousedown=true; - this.timer = setTimeout(this.continueDownClick.bind(this), 750); + if(!isError){ + window.document.onmouseup = this.mouseUp.bindAsEventListener(this); + this.mousedown=true; + this.timer = setTimeout(this.continueDownClick.bind(this), 750); + } }, continueUpClick: function(){ Modified: trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx =================================================================== --- trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2007-11-16 18:04:31 UTC (rev 4047) +++ trunk/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2007-11-16 19:06:12 UTC (rev 4048) @@ -103,7 +103,8 @@ edited:#{component.attributes['enableManualInput']}, disabled:#{component.attributes['disabled']}, chameleon:false, - required: #{component.attributes['required']} + required: #{component.attributes['required']}, + clientErrorMsg: "#{component.attributes['clientErrorMessage']}" }, { min:#{component.attributes['minValue']},