Author: artdaw Date: 2011-01-26 10:08:33 -0500 (Wed, 26 Jan 2011) New Revision: 21234 Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js Log: RF-10252: styles and buttons for datascroller were fixed Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2011-01-26 14:38:58 UTC (rev 21233) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.ecss 2011-01-26 15:08:33 UTC (rev 21234) @@ -1,123 +1,131 @@ -.rf-ds{ - white-space:nowrap; - display:inline-block; - font-size:'#{richSkin.generalSizeFont}'; - padding:1px; - font-family:'#{richSkin.generalFamilyFont}'; - background:'#{richSkin.tableBackgroundColor}'; +.rf-ds { + white-space: nowrap; + display: inline-block; + font-size: '#{richSkin.generalSizeFont}'; + padding: 1px; + font-family: '#{richSkin.generalFamilyFont}'; + background: '#{richSkin.tableBackgroundColor}'; } a.rf-ds-nmb-btn { - color: '#{richSkin.generalTextColor}'; + color: '#{richSkin.generalTextColor}'; } a.rf-ds-btn { - color: '#{richSkin.generalTextColor}'; + color: '#{richSkin.generalTextColor}'; } -.rf-ds-cont { - white-space: nowrap; - display: inline-block; - font-size: '#{richSkin.generalSizeFont}'; - padding: 1px; - font-family: '#{richSkin.generalFamilyFont}'; - background: '#{richSkin.tableBackgroundColor}'; +.rf-ds-cont { + white-space: nowrap; + display: inline-block; + font-size: '#{richSkin.generalSizeFont}'; + padding: 1px; + font-family: '#{richSkin.generalFamilyFont}'; + background: '#{richSkin.tableBackgroundColor}'; } .rf-ds-cont-dec { - border-width: 1px; - border-style: solid; - border-color: '#{richSkin.tableBorderColor}'; + border-width: 1px; + border-style: solid; + border-color: '#{richSkin.tableBorderColor}'; } -.rf-ds-btn { - cursor: pointer; - padding: 2px 10px 3px 10px; - border-width: 1px; - border-style: solid; - border-color: '#{richSkin.tableBorderColor}'; - display: inline-block; +.rf-ds-btn { + cursor: pointer; + padding: 2px 10px 3px 10px; + border-width: 1px; + border-style: solid; + border-color: '#{richSkin.tableBorderColor}'; + display: inline-block; - background-position: top left; - background-repeat: repeat-x; - background-color: '#{richSkin.headerBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.images:dsBtnGrad.png']})"; + background-position: top left; + background-repeat: repeat-x; + background-color: '#{richSkin.headerBackgroundColor}'; + background-image: "url(#{resource['org.richfaces.images:dsBtnGrad.png']})"; - font-size: '#{richSkin.generalSizeFont}'; - font-family: '#{richSkin.generalFamilyFont}'; - color: '#{richSkin.generalTextColor}'; - text-decoration: none; - font-weight: normal; + font-size: '#{richSkin.generalSizeFont}'; + font-family: '#{richSkin.generalFamilyFont}'; + color: '#{richSkin.generalTextColor}'; + text-decoration: none; + font-weight: normal; } +.rf-ds-btn:hover { + color: #fff; +} + +.rf-ds-dis:hover { + color: '#{richSkin.tableBorderColor}'; + cursor: default; +} + .rf-ds-btn-first, .rf-ds-btn-fastrwd, .rf-ds-btn-prev { - margin-right: 1px; + margin-right: 1px; } .rf-ds-btn-next, .rf-ds-btn-fastfwd, .rf-ds-btn-last { - margin-left: 1px; + margin-left: 1px; } -.rf-ds-nmb-btn { - cursor: pointer; - width: 2em; - text-align: center; - margin-left: 1px; - margin-right: 1px; - padding: 2px 2px 3px 2px; - border-width: 1px; - border-style: solid; - border-color: transparent; - border-top-width: 1px; - border-top-style: solid; - border-top-color: '#{richSkin.tableBorderColor}'; +.rf-ds-nmb-btn { + cursor: pointer; + width: 2em; + text-align: center; + margin-left: 1px; + margin-right: 1px; + padding: 2px 2px 3px 2px; + border-width: 1px; + border-style: solid; + border-color: transparent; + border-top-width: 1px; + border-top-style: solid; + border-top-color: '#{richSkin.tableBorderColor}'; - background-color: '#{richSkin.tableBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.images:dsDigGrad.png']})"; + background-color: '#{richSkin.tableBackgroundColor}'; + background-image: "url(#{resource['org.richfaces.images:dsDigGrad.png']})"; - - background-position: top left; - background-repeat: repeat-x; + background-position: top left; + background-repeat: repeat-x; - display: inline-block; - font-size: '#{richSkin.generalSizeFont}'; - font-family: '#{richSkin.generalFamilyFont}'; - text-decoration: none; - color: '#{richSkin.generalTextColor}'; - font-weight: normal; - + display: inline-block; + font-size: '#{richSkin.generalSizeFont}'; + font-family: '#{richSkin.generalFamilyFont}'; + text-decoration: none; + color: '#{richSkin.generalTextColor}'; + font-weight: normal; + } -.rf-ds-hov { - border-width : 1px; - border-style: solid; - border-color: '#{richSkin.tableBorderColor}'; - background-position: top left; - background-repeat: repeat-x; - background-color: '#{richSkin.tableBackgroundColor}'; - background-image: "url(#{resource['org.richfaces.images:dsBtnGradOver.png']})"; +.rf-ds-nmb-btn:hover { + border-width: 1px; + border-style: solid; + border-color: '#{richSkin.tableBorderColor}'; + background-position: top left; + background-repeat: repeat-x; + background-color: '#{richSkin.tableBackgroundColor}'; + background-image: "url(#{resource['org.richfaces.images:dsBtnGradOver.png']})"; } -.rf-ds-press { - border-width: 1px; - border-style: solid; - border-color: '#{richSkin.tableBorderColor}'; - background: '#{richSkin.additionalBackgroundColor}'; +.rf-ds-press { + border-width: 1px; + border-style: solid; + border-color: '#{richSkin.tableBorderColor}'; + background: '#{richSkin.additionalBackgroundColor}'; } -.rf-ds-act { - cursor: default; - font-weight: bold; - border-width: 1px; - bordr-style: solid; - border-color: transparent; - border-bottom-width: 1px; - border-bottom-style: solid; - border-bottom-color: '#{richSkin.tableBorderColor}'; - background: none; +.rf-ds-act, .rf-ds-act:hover { + cursor: default; + font-weight: bold; + border-width: 1px; + bordr-style: solid; + border-color: transparent; + border-bottom-width: 1px; + border-bottom-style: solid; + border-bottom-color: '#{richSkin.tableBorderColor}'; + background: none; } -.rf-ds-dis{ - color: '#{richSkin.tableBorderColor}'; - cursor: default; +.rf-ds-dis { + color: '#{richSkin.tableBorderColor}'; + cursor: default; } \ No newline at end of file Modified: trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js =================================================================== --- trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2011-01-26 14:38:58 UTC (rev 21233) +++ trunk/ui/iteration/ui/src/main/resources/META-INF/resources/org.richfaces/datascroller.js 2011-01-26 15:08:33 UTC (rev 21234) @@ -35,11 +35,11 @@ return eventData; }; - var addToggledClasses = function(el, event) { - if (event.type == 'mousedown' || event.type == 'mouseup') { - el.toggleClass('rf-ds-press'); - } else if(event.type == 'mouseover' || event.type == 'mouseout') { - el.toggleClass('rf-ds-hov'); + var togglePressClass = function(el, event) { + if (event.type == 'mousedown'){ + el.addClass('rf-ds-press'); + } else if (event.type == 'mouseup' || event.type =='mouseout'){ + el.removeClass('rf-ds-press'); } }; @@ -60,12 +60,11 @@ if (options.buttons) { - $(dataScrollerElement).delegate('.rf-ds-btn', 'mouseover mouseout mouseup mousedown', function(event) { + $(dataScrollerElement).delegate('.rf-ds-btn', 'mouseup mousedown mouseout', function(event) { if ($(this).hasClass('rf-ds-dis')) { - $(this).removeClass('rf-ds-hov'); $(this).removeClass('rf-ds-press'); } else { - addToggledClasses($(this), event); + togglePressClass($(this), event); } }); @@ -75,8 +74,8 @@ if (options.digitals) { - $(dataScrollerElement).delegate('.rf-ds-nmb-btn', 'mouseover mouseout mouseup mousedown', function(event) { - addToggledClasses($(this), event); + $(dataScrollerElement).delegate('.rf-ds-nmb-btn', 'mouseup mousedown mouseout', function(event) { + togglePressClass($(this), event); }); initButtons(options.digitals, css, this);