12:02 p.m.
Author: konstantin.mishin
Date: 2009-05-25 13:02:06 -0400 (Mon, 25 May 2009)
New Revision: 14319
Modified:
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
branches/community/3.3.X/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
Log:
RF-7221
Modified:
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss
===================================================================
---
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2009-05-25
16:47:53 UTC (rev 14318)
+++
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/css/slider.xcss 2009-05-25
17:02:06 UTC (rev 14319)
@@ -4,41 +4,41 @@
xmlns="http://www.w3.org/1999/xhtml" >
<f:verbatim><![CDATA[
-.dr-insldr {
+.rich-inslider {
/*width : 200px;*/
height : 20px;
}
-.dr-insldr-vertical {
+.rich-inslider-vertical {
width : 20px;
}
-.dr-insldr-tip {
+.rich-inslider-tip {
position : absolute;
white-space : nowrap;
padding : 2px 2px 2px 2px;
border : 1px solid;
}
-.dr-insldr-size {
+.rich-inslider-size {
width: 100%;
}
-.dr-insldr-size-height {
+.rich-inslider-size-height {
height: 100%;
width: 7px;
padding: 0px 3px;
}
-.dr-insldr-left-num {
+.rich-inslider-left-num {
text-align : left;
border-left: 1px solid;
padding : 0px 3px 0px 3px;
}
-.dr-insldr-right-num{
+.rich-inslider-right-num{
text-align : right;
border-right : 1px solid;
padding : 0px 3px 0px 3px;
}
-.dr-insldr-top-num {
+.rich-inslider-top-num {
text-align : left;
border-top: 1px solid;
border-color: #C4C0B9;
@@ -48,7 +48,7 @@
line-height: 11px;
vertical-align: top;
}
-.dr-insldr-bottom-num{
+.rich-inslider-bottom-num{
text-align : left;
border-bottom : 1px solid;
padding : 0px 3px 0px 3px;
@@ -59,11 +59,11 @@
line-height: 11px;
vertical-align: bottom;
}
-.dr-insldr-vert-spacer{
+.rich-inslider-vert-spacer{
padding : 3px 0px;
vertical-align: bottom;
}
-.dr-insldr-handler{
+.rich-inslider-handler{
background-color : transparent;
width : 7px;
height : 8px;
@@ -73,7 +73,7 @@
z-index : 1;
}
-.dr-insldr-handler-vertical {
+.rich-inslider-handler-vertical {
background-color : transparent;
width : 7px;
height : 8px;
@@ -83,14 +83,14 @@
z-index : 1;
}
-.dr-insldr-tip {
+.rich-inslider-tip {
position : absolute;
white-space : nowrap;
padding : 2px 2px 2px 2px;
border : 1px solid;
}
-.dr-insldr-handler-sel{
+.rich-inslider-handler-selected{
background-color : transparent;
width : 7px;
height : 8px;
@@ -99,13 +99,13 @@
text-align : center;
z-index : 1;
}
-.dr-insldr-track{
+.rich-inslider-track{
background-position: left top;
background-repeat: repeat-x;
height : 8px;
font-size : 1px;
}
-.dr-insldr-track-vertical{
+.rich-inslider-track-vertical{
background-position: left top;
background-repeat: repeat-y;
height : 100%;
@@ -113,15 +113,15 @@
width: 7px;
background-color:#FFFFFF;
}
-.dr-insldr-track-decor-1 {
+.rich-inslider-track-decor-1 {
height : 100%;
width : 100%;
border : 1px solid;
}
-.dr-insldr-track-decor-2 {
+.rich-inslider-track-decor-2 {
border : 1px solid white;
}
-.dr-insldr-field {
+.rich-inslider-field {
border:1px inset;
padding: 0px 0px 0px 3px;
margin-top:0px;
@@ -130,48 +130,48 @@
background-repeat:repeat-x;
}
-.dr-insldr-field-left {
+.rich-inslider-field-left {
margin-right: 10px;
}
-.dr-insldr-field-right {
+.rich-inslider-field-right {
margin-left: 10px;
}
-.dr-insldr-field-top {
+.rich-inslider-field-top {
margin-bottom: 7px;
}
-.dr-insldr-field-bottom {
+.rich-inslider-field-bottom {
margin-top: 7px;
}
-.dr-insldr-arrow {
+.rich-inslider-arrow {
background-repeat:no-repeat;
width: 15px;
height: 15px;
}
-.dr-insldr-dec-horizontal {
+.rich-inslider-dec-horizontal {
background-position: 5px 4px;
}
-.dr-insldr-inc-horizontal {
+.rich-inslider-inc-horizontal {
background-position: 4px 4px;
}
-.dr-insldr-inc-vertical {
+.rich-inslider-inc-vertical {
background-position: 3px 5px;
}
-.dr-insldr-dec-vertical {
+.rich-inslider-dec-vertical {
background-position: 3px 3px;
}
-.dr-insldr-dec-horizontal-sel {
+.rich-inslider-dec-horizontal-selected {
background-position: 5px 4px;
}
-.dr-insldr-inc-horizontal-sel {
+.rich-inslider-inc-horizontal-selected {
background-position: 4px 4px;
}
-.dr-insldr-inc-vertical-sel {
+.rich-inslider-inc-vertical-selected {
background-position: 3px 5px;
}
-.dr-insldr-dec-vertical-sel {
+.rich-inslider-dec-vertical-selected {
background-position: 3px 3px;
}
-.dr-insldr-td-arrow {
+.rich-inslider-td-arrow {
text-align: left;
vertical-align: bottom;
}
@@ -179,21 +179,21 @@
]]>
</f:verbatim>
- <u:selector name=".dr-insldr-tip">
+ <u:selector name=".rich-inslider-tip">
<u:style name="background-color" skin="tipBackgroundColor"/>
<u:style name="border-color" skin="tipBorderColor"/>
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
- <u:selector name=".dr-insldr-tip-step">
+ <u:selector name=".rich-inslider-tip-step">
<u:style name="background-color"
skin="tipBackgroundColor"/>
<u:style name="border-color" skin="tipBorderColor"/>
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="font-size" skin="generalSizeFont"/>
</u:selector>
- <u:selector name=".dr-insldr-left-num">
+ <u:selector name=".rich-inslider-left-num">
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="color" skin="generalTextColor"/>
@@ -201,7 +201,7 @@
<u:style name="line-height" skin="generalSizeFont"/>
</u:selector>
- <u:selector name=".dr-insldr-right-num">
+ <u:selector name=".rich-inslider-right-num">
<u:style name="font-family" skin="generalFamilyFont"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="color" skin="generalTextColor"/>
@@ -209,94 +209,94 @@
<u:style name="line-height" skin="generalSizeFont"/>
</u:selector>
- <u:selector name=".dr-insldr-track">
+ <u:selector name=".rich-inslider-track">
<u:style name="background-color"
skin="controlBackgroundColor"/>
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderTrackGradient" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-track-decor-1">
+ <u:selector name=".rich-inslider-track-decor-1">
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
- <u:selector name=".dr-insldr-handler">
+ <u:selector name=".rich-inslider-handler">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.html.images.SliderArrowImage"
/>
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-handler-vertical">
+ <u:selector name=".rich-inslider-handler-vertical">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowImageRight" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-track-vertical">
+ <u:selector name=".rich-inslider-track-vertical">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderTrackGradientVertical" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-dec-horizontal">
+ <u:selector name=".rich-inslider-dec-horizontal">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowImageLeft" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-inc-horizontal">
+ <u:selector name=".rich-inslider-inc-horizontal">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowImageRight" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-inc-vertical">
+ <u:selector name=".rich-inslider-inc-vertical">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowImageTop" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-dec-vertical">
+ <u:selector name=".rich-inslider-dec-vertical">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowImage" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-dec-horizontal-sel">
+ <u:selector name=".rich-inslider-dec-horizontal-selected">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageLeft" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-inc-horizontal-sel">
+ <u:selector name=".rich-inslider-inc-horizontal-selected">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageRight" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-inc-vertical-sel">
+ <u:selector name=".rich-inslider-inc-vertical-selected">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageTop" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-dec-vertical-sel">
+ <u:selector name=".rich-inslider-dec-vertical-selected">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImage" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-handler-sel">
+ <u:selector name=".rich-inslider-handler-selected">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImage" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-handler-sel-vertical">
+ <u:selector name=".rich-inslider-handler-selected-vertical">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderArrowSelectedImageRight" />
</u:style>
</u:selector>
- <u:selector name=".dr-insldr-track-decor-2">
+ <u:selector name=".rich-inslider-track-decor-2">
<u:style name="border-color" skin="controlBackgroundColor"/>
</u:selector>
- <u:selector name=".dr-insldr-field">
+ <u:selector name=".rich-inslider-field">
<u:style name="background-image">
<f:resource
f:key="org.richfaces.renderkit.html.images.SliderFieldGradient" />
</u:style>
Modified:
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js
===================================================================
---
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-05-25
16:47:53 UTC (rev 14318)
+++
branches/community/3.3.X/ui/inputnumber-slider/src/main/resources/org/richfaces/renderkit/html/script/SliderScript.js 2009-05-25
17:02:06 UTC (rev 14319)
@@ -24,15 +24,15 @@
this.orientation = this.options.orientation;
this.classes = {};
- this.classes.arrow = "dr-insldr-handler rich-inslider-handler";
- this.classes.arrowSelected = "dr-insldr-handler-sel
rich-inslider-handler-selected";
+ this.classes.arrow = "rich-inslider-handler";
+ this.classes.arrowSelected = "rich-inslider-handler-selected";
this.classes.temp = this.handle.className;
- this.classes.base = " " +
this.trim(this.classes.temp.replace("dr-insldr-handler
rich-inslider-handler",""));
+ this.classes.base = " " +
this.trim(this.classes.temp.replace("rich-inslider-handler",""));
if(this.orientation=="vertical"){
- this.classes.arrow = "dr-insldr-handler-vertical
rich-inslider-handler-vertical";
- this.classes.arrowSelected = "dr-insldr-handler-sel-vertical
rich-inslider-handler-selected-vertical";
- this.classes.base = " " +
this.trim(this.classes.temp.replace("dr-insldr-handler-vertical
rich-inslider-handler-vertical",""));
+ this.classes.arrow = "rich-inslider-handler-vertical";
+ this.classes.arrowSelected = "rich-inslider-handler-selected-vertical";
+ this.classes.base = " " +
this.trim(this.classes.temp.replace("rich-inslider-handler-vertical",""));
}
this.classes.handleSelected = " " + handleSelectedClass;
@@ -472,7 +472,7 @@
increaseDown : function(event){
this.arrowButton = $(event.target);
- this.arrowButton.className =
this.arrowButton.className.replace("Class","SelectedClass").replace("al","al-sel");
+ this.arrowButton.className =
this.arrowButton.className.replace("Class","SelectedClass").replace("al","al-selected");
window.document.onmouseup = this.eventIncreaseUp.bindAsEventListener(this);
if(!this.disabled){
if (this.options.currValue){
@@ -485,7 +485,7 @@
decreaseDown : function(event){
this.arrowButton = $(event.target);
- this.arrowButton.className =
this.arrowButton.className.replace("Class","SelectedClass").replace("al","al-sel");
+ this.arrowButton.className =
this.arrowButton.className.replace("Class","SelectedClass").replace("al","al-selected");
window.document.onmouseup = this.eventDecreaseUp.bindAsEventListener(this);
if(!this.disabled){
if (this.options.currValue){
@@ -501,7 +501,7 @@
if (this.options.currValue){
Element.hide(this.tipArrowInc);
}
- this.arrowButton.className =
this.arrowButton.className.replace("SelectedClass","Class").replace("al-sel","al");
+ this.arrowButton.className =
this.arrowButton.className.replace("SelectedClass","Class").replace("al-selected","al");
window.document.onmouseup = this.prevMouseUp;
},
@@ -510,7 +510,7 @@
if (this.options.currValue){
Element.hide(this.tipArrowDec);
}
- this.arrowButton.className =
this.arrowButton.className.replace("SelectedClass","Class").replace("al-sel","al");
+ this.arrowButton.className =
this.arrowButton.className.replace("SelectedClass","Class").replace("al-selected","al");
window.document.onmouseup = this.prevMouseUp;
},
Modified:
branches/community/3.3.X/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx
===================================================================
---
branches/community/3.3.X/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2009-05-25
16:47:53 UTC (rev 14318)
+++
branches/community/3.3.X/ui/inputnumber-slider/src/main/templates/inputNumberSlider.jspx 2009-05-25
17:02:06 UTC (rev 14319)
@@ -56,7 +56,7 @@
]]>
</jsp:scriptlet>
- <table id="#{clientId}" border="0" cellpadding="0"
cellspacing="0" class="dr-insldr-vertical rich-slider
#{component.attributes['styleClass']}"
+ <table id="#{clientId}" border="0" cellpadding="0"
cellspacing="0" class="rich-inslider-vertical rich-slider
#{component.attributes['styleClass']}"
style="height: #{height};#{style}"
x:passThruWithExclusions="id,boundClass,tipClass,class,width,height,style,border">
<tbody>
<tr>
@@ -71,7 +71,7 @@
name="#{clientId}"
value="#{this:getInputValue(context,component)}"
type="text"
- class="dr-insldr-field dr-insldr-field-top
rich-inslider-field #{component.attributes['inputClass']}"
+ class="rich-inslider-field-top
rich-inslider-field #{component.attributes['inputClass']}"
style="#{component.attributes['inputStyle']}; #{color}"
readonly="#{inputReadOnly}"
disabled="#{inputDisabled}"
@@ -113,15 +113,15 @@
if
(((Boolean)variables.getVariable("showArrows")).booleanValue()) {
]]></jsp:scriptlet>
<tr>
- <td class="dr-insldr-td-arrow">
+ <td class="rich-inslider-td-arrow">
<div style="position : relative">
- <div id="#{clientId}TipArrowInc"
class="dr-insldr-tip rich-inslider-tip
#{component.attributes['tipClass']}" style="display: none;
#{component.attributes['tipStyle']}">
+ <div id="#{clientId}TipArrowInc"
class="rich-inslider-tip #{component.attributes['tipClass']}"
style="display: none; #{component.attributes['tipStyle']}">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
</div>
<div id="#{clientId}ArrowInc"
- class="dr-insldr-inc-vertical
dr-insldr-arrow #{component.attributes['increaseClass']}"
+ class="rich-inslider-inc-vertical
rich-inslider-arrow #{component.attributes['increaseClass']}"
style="#{component.attributes['increaseStyle']}"
/>
</div>
@@ -135,13 +135,13 @@
<table border="0" cellpadding="0"
cellspacing="0" style="height: 100%;">
<tbody>
<tr>
- <td rowspan="2"
id="#{clientId}Track" class="dr-insldr-size-height">
- <div class="dr-insldr-track-vertical
rich-inslider-track #{component.attributes['barClass']}"
+ <td rowspan="2"
id="#{clientId}Track" class="rich-inslider-size-height">
+ <div class="rich-inslider-track-vertical
rich-inslider-track #{component.attributes['barClass']}"
style="#{component.attributes['barStyle']}">
- <table class="dr-insldr-track-decor-1
rich-inslider-track-border" cellpadding="0" cellspacing="0" >
+ <table class="rich-inslider-track-decor-1
rich-inslider-track-border" cellpadding="0" cellspacing="0" >
<tbody>
<tr style="height: 98%">
- <td
class="dr-insldr-track-decor-2">
+ <td
class="rich-inslider-track-decor-2">
<img src="#{spacer}"
style="display: block;" />
</td>
</tr>
@@ -149,12 +149,12 @@
</table>
</div>
<div style="position : relative">
- <div id="#{clientId}Tip"
class="dr-insldr-tip rich-inslider-tip
#{component.attributes['tipClass']}" style="display: none;left: 9px;
#{component.attributes['tipStyle']}">
+ <div id="#{clientId}Tip"
class="rich-inslider-tip #{component.attributes['tipClass']}"
style="display: none;left: 9px;
#{component.attributes['tipStyle']}">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
</div>
- <div class="dr-insldr-handler-vertical
#{component.attributes['handleClass']}" id="#{clientId}Handle"
style="visibility:visible; top: -7px; left:1px;">
+ <div class="rich-inslider-handler-vertical
#{component.attributes['handleClass']}" id="#{clientId}Handle"
style="visibility:visible; top: -7px; left:1px;">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
@@ -164,7 +164,7 @@
<jsp:scriptlet><![CDATA[
if (attributeToBoolean(component,
"showBoundaryValues")){
]]></jsp:scriptlet>
- <td class="dr-insldr-top-num
#{component.attributes['boundClass']}">
+ <td class="rich-inslider-top-num
#{component.attributes['boundClass']}">
#{component.attributes['maxValue']}
</td>
<jsp:scriptlet><![CDATA[
@@ -179,7 +179,7 @@
<jsp:scriptlet><![CDATA[
if (attributeToBoolean(component,
"showBoundaryValues")){
]]></jsp:scriptlet>
- <td class="dr-insldr-bottom-num
#{component.attributes['boundClass']}">
+ <td class="rich-inslider-bottom-num
#{component.attributes['boundClass']}">
#{component.attributes['minValue']}
</td>
<jsp:scriptlet><![CDATA[
@@ -199,15 +199,15 @@
if
(((Boolean)variables.getVariable("showArrows")).booleanValue()) {
]]></jsp:scriptlet>
<tr>
- <td class="dr-insldr-td-arrow">
+ <td class="rich-inslider-td-arrow">
<div style="position : relative">
- <div id="#{clientId}TipArrowDec"
class="dr-insldr-tip rich-inslider-tip
#{component.attributes['tipClass']}" style="display: none;
#{component.attributes['tipStyle']}">
+ <div id="#{clientId}TipArrowDec"
class="rich-inslider-tip #{component.attributes['tipClass']}"
style="display: none; #{component.attributes['tipStyle']}">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
</div>
<div id="#{clientId}ArrowDec"
- class="dr-insldr-dec-vertical
dr-insldr-arrow #{component.attributes['decreaseClass']}"
+ class="rich-inslider-dec-vertical
rich-inslider-arrow #{component.attributes['decreaseClass']}"
style="#{component.attributes['decreaseStyle']}"
/>
</div>
@@ -228,7 +228,7 @@
name="#{clientId}"
value="#{this:getInputValue(context,component)}"
type="text"
- class="dr-insldr-field
dr-insldr-field-bottom rich-inslider-field
#{component.attributes['inputClass']}"
+ class="rich-inslider-field-bottom
rich-inslider-field #{component.attributes['inputClass']}"
style="#{component.attributes['inputStyle']}; #{color}"
readonly="#{inputReadOnly}"
disabled="#{inputDisabled}"
@@ -310,7 +310,7 @@
]]>
</jsp:scriptlet>
- <table id="#{clientId}" border="0" cellpadding="0"
cellspacing="0" class="dr-insldr rich-slider
#{component.attributes['styleClass']}"
+ <table id="#{clientId}" border="0" cellpadding="0"
cellspacing="0" class="rich-inslider rich-slider
#{component.attributes['styleClass']}"
style="width: #{width};#{style}"
x:passThruWithExclusions="id,boundClass,tipClass,class,width,height,style,border">
<tbody>
<tr>
@@ -325,7 +325,7 @@
name="#{clientId}"
value="#{this:getInputValue(context,component)}"
type="text"
- class="dr-insldr-field dr-insldr-field-left
rich-inslider-field #{component.attributes['inputClass']}"
+ class="rich-inslider-field-left
rich-inslider-field #{component.attributes['inputClass']}"
style="#{component.attributes['inputStyle']}; #{color}"
readonly="#{inputReadOnly}"
disabled="#{inputDisabled}"
@@ -366,15 +366,15 @@
<jsp:scriptlet><![CDATA[
if
(((Boolean)variables.getVariable("showArrows")).booleanValue()) {
]]></jsp:scriptlet>
- <td rowspan="2" class="dr-insldr-td-arrow">
+ <td rowspan="2" class="rich-inslider-td-arrow">
<div style="position : relative">
- <div id="#{clientId}TipArrowDec"
class="dr-insldr-tip rich-inslider-tip
#{component.attributes['tipClass']}" style="display: none;
#{component.attributes['tipStyle']}">
+ <div id="#{clientId}TipArrowDec"
class="rich-inslider-tip #{component.attributes['tipClass']}"
style="display: none; #{component.attributes['tipStyle']}">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
</div>
<div id="#{clientId}ArrowDec"
- class="dr-insldr-dec-horizontal
dr-insldr-arrow #{component.attributes['decreaseClass']}"
+ class="rich-inslider-dec-horizontal
rich-inslider-arrow #{component.attributes['decreaseClass']}"
style="#{component.attributes['decreaseStyle']}"
/>
</div>
@@ -383,7 +383,7 @@
}
]]></jsp:scriptlet>
- <td class="dr-insldr-left-num rich-inslider-left-num
#{component.attributes['boundClass']}">
+ <td class="rich-inslider-left-num
#{component.attributes['boundClass']}">
<jsp:scriptlet><![CDATA[
if (attributeToBoolean(component, "showBoundaryValues")){
]]></jsp:scriptlet>
@@ -392,7 +392,7 @@
}
]]></jsp:scriptlet>
</td>
- <td class="dr-insldr-right-num rich-inslider-right-num
#{component.attributes['boundClass']}">
+ <td class="rich-inslider-right-num
#{component.attributes['boundClass']}">
<jsp:scriptlet><![CDATA[
if (attributeToBoolean(component, "showBoundaryValues")){
]]></jsp:scriptlet>
@@ -405,15 +405,15 @@
<jsp:scriptlet><![CDATA[
if
(((Boolean)variables.getVariable("showArrows")).booleanValue()) {
]]></jsp:scriptlet>
- <td rowspan="2" class="dr-insldr-td-arrow">
+ <td rowspan="2" class="rich-inslider-td-arrow">
<div style="position : relative">
- <div id="#{clientId}TipArrowInc"
class="dr-insldr-tip rich-inslider-tip
#{component.attributes['tipClass']}" style="display: none;
#{component.attributes['tipStyle']}">
+ <div id="#{clientId}TipArrowInc"
class="rich-inslider-tip #{component.attributes['tipClass']}"
style="display: none; #{component.attributes['tipStyle']}">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
</div>
<div id="#{clientId}ArrowInc"
- class="dr-insldr-inc-horizontal
dr-insldr-arrow #{component.attributes['increaseClass']}"
+ class="rich-inslider-inc-horizontal
rich-inslider-arrow #{component.attributes['increaseClass']}"
style="#{component.attributes['increaseStyle']}"
/>
</div>
@@ -433,7 +433,7 @@
name="#{clientId}"
value="#{this:getInputValue(context,component)}"
type="text"
- class="dr-insldr-field dr-insldr-field-right rich-inslider-field
#{component.attributes['inputClass']}"
+ class="rich-inslider-field-right rich-inslider-field
#{component.attributes['inputClass']}"
style="#{component.attributes['inputStyle']}; #{color}"
readonly="#{inputReadOnly}"
disabled="#{inputDisabled}"
@@ -472,28 +472,28 @@
]]></jsp:scriptlet>
</tr>
<tr>
- <td colspan="2" class="dr-insldr-size
dr-insldr-vert-spacer">
- <table border="0" cellpadding="0" cellspacing="0"
class="dr-insldr-size">
+ <td colspan="2" class="rich-inslider-size
rich-inslider-vert-spacer">
+ <table border="0" cellpadding="0" cellspacing="0"
class="rich-inslider-size">
<tbody>
<tr>
<td id="#{clientId}Track">
<div style="position : relative">
- <div id="#{clientId}Tip" class="dr-insldr-tip
rich-inslider-tip #{component.attributes['tipClass']}" style="display:
none;#{component.attributes['tipStyle']}">
+ <div id="#{clientId}Tip" class="rich-inslider-tip
#{component.attributes['tipClass']}" style="display:
none;#{component.attributes['tipStyle']}">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
</div>
- <div class="dr-insldr-handler rich-inslider-handler
#{component.attributes['handleClass']}" id="#{clientId}Handle"
style="visibility:hidden;">
+ <div class="rich-inslider-handler
#{component.attributes['handleClass']}" id="#{clientId}Handle"
style="visibility:hidden;">
<jsp:scriptlet><![CDATA[
writer.write(" ");
]]></jsp:scriptlet>
</div>
</div>
- <div class="dr-insldr-track rich-inslider-track
#{component.attributes['barClass']}"
style="#{component.attributes['barStyle']}">
- <table class="dr-insldr-track-decor-1" cellpadding="0"
cellspacing="0">
+ <div class="rich-inslider-track
#{component.attributes['barClass']}"
style="#{component.attributes['barStyle']}">
+ <table class="rich-inslider-track-decor-1"
cellpadding="0" cellspacing="0">
<tbody>
<tr>
- <td class="dr-insldr-track-decor-2">
+ <td class="rich-inslider-track-decor-2">
<img src="#{spacer}" alt="" style="display:
block;" />
</td>
</tr>
Modified:
branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java
===================================================================
---
branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2009-05-25
16:47:53 UTC (rev 14318)
+++
branches/community/3.3.X/ui/inputnumber-slider/src/test/java/org/richfaces/component/InputNumberSliderComponentTest.java 2009-05-25
17:02:06 UTC (rev 14319)
@@ -134,7 +134,7 @@
assertNotNull(htmlSlider);
assertTrue(htmlSlider.getAttributeValue("class").contains(
- "dr-insldr rich-slider"));
+ "rich-inslider rich-slider"));
HtmlInput htmlSliderInput = (HtmlInput) renderedView.getHtmlElementById(
slider.getClientId(facesContext) + "Input");
@@ -143,31 +143,31 @@
String a = htmlSliderInput.getClassAttribute();
assertTrue(htmlSliderInput.getClassAttribute().contains(
- "dr-insldr-field dr-insldr-field-right rich-inslider-field"));
+ "rich-inslider-field-right rich-inslider-field"));
assertTrue(htmlSliderInput.getTypeAttribute().equals("text"));
DomNode numContainer = htmlSliderInput.getParentNode()
.getPreviousSibling();
assertTrue(((HtmlElement) numContainer).getAttributeValue(
"class").contains(
- "dr-insldr-right-num rich-inslider-right-num"));
+ "rich-inslider-right-num"));
assertTrue(((HtmlElement) (numContainer.getPreviousSibling()))
.getAttributeValue("class").contains(
- "dr-insldr-left-num rich-inslider-left-num"));
+ "rich-inslider-left-num"));
HtmlElement tip = renderedView.getHtmlElementById(slider.getClientId(
facesContext) + "Tip");
assertTrue(tip.getAttributeValue("class").contains(
- "dr-insldr-tip rich-inslider-tip"));
+ "rich-inslider-tip"));
HtmlElement handle = renderedView.getHtmlElementById(slider.getClientId(
facesContext) + "Handle");
assertTrue(handle.getAttributeValue("class").contains(
- "dr-insldr-handler rich-inslider-handler"));
+ "rich-inslider-handler"));
HtmlElement track = (HtmlElement) tip.getParentNode().getNextSibling();
assertTrue(track.getAttributeValue("class").contains(
- "dr-insldr-track rich-inslider-track"));
+ "rich-inslider-track"));
}
public void testHiddenInput() throws Exception {
@@ -367,7 +367,7 @@
assertNotNull(htmlSlider);
assertTrue(htmlSlider.getAttributeValue("class").contains(
- "dr-insldr-vertical rich-slider "));
+ "rich-inslider-vertical rich-slider "));
HtmlInput htmlSliderInput = (HtmlInput) renderedView
.getHtmlElementById(slider.getClientId(facesContext) + "Input");
@@ -375,7 +375,7 @@
assertNotNull(htmlSliderInput);
assertTrue(htmlSliderInput.getClassAttribute().contains(
- "dr-insldr-field dr-insldr-field-top rich-inslider-field "));
+ "rich-inslider-field-top rich-inslider-field "));
assertTrue(htmlSliderInput.getTypeAttribute().equals("text"));
HtmlDivision track = (HtmlDivision) ((HtmlElement) renderedView
@@ -383,26 +383,26 @@
.getFirstDomChild();
assertTrue(track.getAttributeValue("class").contains(
- "dr-insldr-track-vertical rich-inslider-track"));
+ "rich-inslider-track-vertical rich-inslider-track"));
DomNode numContainer = track.getParentDomNode().getParentDomNode()
.getNextDomSibling().getFirstDomChild();
assertTrue(((HtmlElement) numContainer).getAttributeValue("class")
- .contains("dr-insldr-bottom-num "));
+ .contains("rich-inslider-bottom-num "));
assertTrue(((HtmlElement) track.getParentDomNode().getNextDomSibling())
- .getAttributeValue("class").contains("dr-insldr-top-num "));
+ .getAttributeValue("class").contains("rich-inslider-top-num "));
HtmlElement tip = renderedView.getHtmlElementById(slider
.getClientId(facesContext)
+ "Tip");
assertTrue(tip.getAttributeValue("class").contains(
- "dr-insldr-tip rich-inslider-tip"));
+ "rich-inslider-tip"));
HtmlElement handle = renderedView.getHtmlElementById(slider
.getClientId(facesContext)
+ "Handle");
assertTrue(handle.getAttributeValue("class").contains(
- "dr-insldr-handler-vertical "));
+ "rich-inslider-handler-vertical "));
}
public void testShowArrows() throws Exception {
@@ -412,19 +412,19 @@
.getHtmlElementById(slider.getClientId(facesContext)
+ "ArrowInc");
assertTrue(htmlSliderArrowInc.getClassAttribute().equals(
- "dr-insldr-inc-horizontal dr-insldr-arrow "));
+ "rich-inslider-inc-horizontal rich-inslider-arrow "));
HtmlDivision htmlSliderArrowDec = (HtmlDivision) renderedView
.getHtmlElementById(slider.getClientId(facesContext)
+ "ArrowDec");
assertTrue(htmlSliderArrowDec.getClassAttribute().equals(
- "dr-insldr-dec-horizontal dr-insldr-arrow "));
+ "rich-inslider-dec-horizontal rich-inslider-arrow "));
HtmlDivision htmlSliderTipArrowInc = (HtmlDivision) renderedView
.getHtmlElementById(slider.getClientId(facesContext)
+ "TipArrowInc");
assertTrue(htmlSliderTipArrowInc.getClassAttribute().equals(
- "dr-insldr-tip rich-inslider-tip "));
+ "rich-inslider-tip "));
assertTrue(htmlSliderTipArrowInc.getStyleAttribute().equals(
"display: none; "));
@@ -432,7 +432,7 @@
.getHtmlElementById(slider.getClientId(facesContext)
+ "TipArrowDec");
assertTrue(htmlSliderTipArrowDec.getClassAttribute().equals(
- "dr-insldr-tip rich-inslider-tip "));
+ "rich-inslider-tip "));
assertTrue(htmlSliderTipArrowDec.getStyleAttribute().equals(
"display: none; "));
}