JBoss Rich Faces SVN: r5304 - in branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI: controls/grid and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-01-11 10:34:00 -0500 (Fri, 11 Jan 2008)
New Revision: 5304
Modified:
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js
branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
Log:
RF-726
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2008-01-11 15:31:56 UTC (rev 5303)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/common/utils/Utils.js 2008-01-11 15:34:00 UTC (rev 5304)
@@ -299,6 +299,12 @@
}
};
+Utils.trace = function(s) {
+ LOG.info(s + ": " + (new Date().getTime()- this._d) + " ");
+ //window.status = s + ": " + (new Date().getTime()- this._d) + " " + window.status;
+ this._d = new Date().getTime();
+};
+
Array.prototype.unbreakableEach = function(f) {
for (var i = 0; i < this.length; i++) {
f(this[i], i);
Modified: branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js
===================================================================
--- branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-11 15:31:56 UTC (rev 5303)
+++ branches/3.1.x/ui/scrollableDataTable/src/main/javascript/ClientUI/controls/grid/GridHeader.js 2008-01-11 15:34:00 UTC (rev 5304)
@@ -120,7 +120,7 @@
var ids = this.grid.options.ids;
var count = this.frozenCells.length;
for(i=0; i<count; i++) {
- this.trace(i);
+ Utils.trace(i);
cell = this.frozenCells[i];
columns[j] = {
columnId: ids[i],
@@ -137,18 +137,18 @@
sortable: Validators.getBoolean(cell.getAttribute("sortable"), false),
sorted: Validators.getBoolean(cell.getAttribute("sorted"), "desc")
};
- this.trace(i+"a");
+ Utils.trace(i+"a");
if(columns[j].sortable)
Event.observe(cell, 'click', eventCellMouseDown);
- this.trace(i+"a1");
+ Utils.trace(i+"a1");
h = cell.offsetHeight;
- this.trace(i+"a2");
+ Utils.trace(i+"a2");
if(h > defaultHeight) defaultHeight = h;
defaultWidth += columns[j].width;
columns[j].object = new ClientUI.common.box.InlineBox(cell, null, true);
- this.trace(i+"b");
+ Utils.trace(i+"b");
var details = this._getCellElements(j);
// separator
columns[j].sep = new ClientUI.common.box.InlineBox(details[0], null, true);
@@ -165,7 +165,7 @@
//columns[j].sortDesc = new ClientUI.common.box.Box(details[1], null, true);
//columns[j].sortAsc = new ClientUI.common.box.Box(details[2], null, true);
j++;
- this.trace(i+"c");
+ Utils.trace(i+"c");
}
cols = this.headerRow.getElement().getElementsByTagName("col");
@@ -231,10 +231,6 @@
return true;
},
- trace: function(s) {
- window.status = s + ": " + (new Date().getTime()- this._d) + " $$ " + window.status;
- this._d = new Date().getTime();
- },
_getCellElements: function(column) {
var details = new Array(3);
var clientId = this.grid.getElement().id;
17 years
JBoss Rich Faces SVN: r5303 - trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2008-01-11 10:31:56 -0500 (Fri, 11 Jan 2008)
New Revision: 5303
Modified:
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
http://jira.jboss.com/jira/browse/RF-1485
Modified: trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-01-11 15:10:13 UTC (rev 5302)
+++ trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-01-11 15:31:56 UTC (rev 5303)
@@ -213,6 +213,7 @@
},
doShow: function(e){
+ this.setScrollDelta();
var obj;
if (!e) var e = window.event;
@@ -318,6 +319,8 @@
window.clearTimeout(this.hidingTimerHandle);
this.hidingTimerHandle = undefined;
}
+
+ this.scrollDelta = undefined;
},
doEnable: function(){
@@ -327,11 +330,28 @@
this.disabled = true;
},
+ setScrollDelta: function() {
+ if (!this.scrollDelta) {
+ this.scrollDelta = [0, 0];
+ }
+ var parentNode = this.parent;
+ while (parentNode && !/^body$/i.test(parentNode.tagName)) {
+ if (/^absolute$/i.test(Richfaces.getComputedStyle(parentNode, "position"))) {
+ if (parentNode.scrollLeft) {
+ this.scrollDelta[0] += parentNode.scrollLeft;
+ }
+ if (parentNode.scrollTop) {
+ this.scrollDelta[1] += parentNode.scrollTop;
+ }
+ }
+ parentNode = parentNode.parentNode;
+ }
+ },
+
/*
* we can pass here not event only, but also object {'clientX':XXX, 'clientY':XXX}
*/
setToolTipPosition: function(e){
-
var toolTipX=0;
var toolTipY=0;
@@ -364,6 +384,10 @@
var coords = this.fitToolTip(e.clientX, e.clientY, {'x':toolTipX , 'y':toolTipY},elementDim, horizontalDirection, verticalDirection, {'x':this.horizontalOffset, 'y':this.verticalOffset});
+ if (this.scrollDelta) {
+ coords.x += this.scrollDelta[0];
+ coords.y += this.scrollDelta[1];
+ }
Element.setStyle(this.toolTip, {"left": coords.x + "px", "top": coords.y + "px"});
if(this.iframe)
{
17 years
JBoss Rich Faces SVN: r5302 - trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css.
by richfaces-svn-commits＠lists.jboss.org
Author: akushunin
Date: 2008-01-11 10:10:13 -0500 (Fri, 11 Jan 2008)
New Revision: 5302
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
Log:
generalBackgroundColor renamed to tableBackgroundColor in rich-calendar-cell
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2008-01-11 15:09:09 UTC (rev 5301)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2008-01-11 15:10:13 UTC (rev 5302)
@@ -141,7 +141,7 @@
<u:selector name=".rich-calendar-cell">
<u:style name="border-bottom-color" skin="panelBorderColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
- <u:style name="background-color" skin="generalBackgroundColor"/>
+ <u:style name="background-color" skin="tableBackgroundColor"/>
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
17 years
JBoss Rich Faces SVN: r5301 - branches/3.1.x/ui/inputnumber-spinner/src/main/templates.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-11 10:09:09 -0500 (Fri, 11 Jan 2008)
New Revision: 5301
Modified:
branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
Log:
RF-1574
Modified: branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx
===================================================================
--- branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-01-11 14:26:49 UTC (rev 5300)
+++ branches/3.1.x/ui/inputnumber-spinner/src/main/templates/inputNumberSpinner.jspx 2008-01-11 15:09:09 UTC (rev 5301)
@@ -20,7 +20,13 @@
<h:scripts>new org.ajax4jsf.javascript.PrototypeScript(),script/SpinnerScript.js,/org/richfaces/renderkit/html/scripts/browser_info.js</h:scripts>
<h:styles>css/spinner.xcss</h:styles>
-<table width="2%" class="dr-spnr-c rich-spinner-c #{component.attributes['styleClass']}" id="#{clientId}" cellspacing="0" cellpadding="0" border="0" style="#{component.attributes['style']}">
+<table width="2%" class="dr-spnr-c rich-spinner-c #{component.attributes['styleClass']}" id="#{clientId}" cellspacing="0" cellpadding="0" border="0" style="#{component.attributes['style']}" onclick="#{component.attributes['onclick']}"
+ ondblclick="#{component.attributes['ondblclick']}"
+ onmousedown="#{component.attributes['onmousedown']}"
+ onmousemove="#{component.attributes['onmousemove']}"
+ onmouseout="#{component.attributes['onmouseout']}"
+ onmouseover="#{component.attributes['onmouseover']}"
+ onmouseup="#{component.attributes['onmouseup']}">
<tbody>
<tr>
<td width="1%" class="dr-spnr-e rich-spinner-input-container" id="#{clientId}Edit">
@@ -30,6 +36,9 @@
onselect="#{component.attributes['onselect']}"
onfocus="#{component.attributes['onfocus']}"
onblur="#{component.attributes['onblur']}"
+ onkeypress="#{component.attributes['onkeypress']}"
+ onkeyup="#{component.attributes['onkeyup']}"
+ onkeydown="#{component.attributes['onkeydown']}"
type="text"
size="#{component.attributes['inputSize']}"
name="#{clientId}"
17 years
JBoss Rich Faces SVN: r5300 - in trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html: scripts and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: pyaschenko
Date: 2008-01-11 09:26:49 -0500 (Fri, 11 Jan 2008)
New Revision: 5300
Modified:
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
Log:
RF-1725
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2008-01-11 12:43:31 UTC (rev 5299)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/css/calendar.xcss 2008-01-11 14:26:49 UTC (rev 5300)
@@ -287,10 +287,17 @@
<u:style name="position" value="relative"/>
</u:selector>
+ <u:selector name=".rich-calendar-date-layout">
+ <u:style name="background" skin="tableBackgroundColor"/>
+ <u:style name="border" value="1px solid"/>
+ <u:style name="border-color" skin="panelBorderColor"/>
+ <u:style name="position" value="relative"/>
+ </u:selector>
+
<u:selector name=".rich-calendar-editor-container">
</u:selector>
- <u:selector name=".rich-calendar-time-layout, .rich-calendar-time-layout input">
+ <u:selector name=".rich-calendar-time-layout, .rich-calendar-date-layout, .rich-calendar-time-layout input">
<u:style name="font-size" skin="generalSizeFont"/>
<u:style name="font-family" skin="generalFamilyFont"/>
</u:selector>
@@ -308,12 +315,32 @@
<u:style name="padding" value="0px 1px 7px 7px"/>
</u:selector>
+ <u:selector name=".rich-calendar-date-layout-cancel">
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="border-top" value="1px solid"/>
+ <u:style name="border-top-color" skin="panelBorderColor"/>
+ <u:style name="padding" value="5px 5px 5px 1px"/>
+ </u:selector>
+
+ <u:selector name=".rich-calendar-date-layout-ok">
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="border-top" value="1px solid"/>
+ <u:style name="border-top-color" skin="panelBorderColor"/>
+ <u:style name="padding" value="5px 1px 5px 5px"/>
+ </u:selector>
+
+ <u:selector name=".rich-calendar-date-layout-split">
+ <u:style name="border-right" value="1px solid"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
+ </u:selector>
+
<u:selector name=".rich-calendar-time-btn">
<u:style name="width" value="45px"/>
<u:style name="border" value="1px solid"/>
<u:style name="border-color" skin="tableBackgroundColor"/>
<u:style name="border-right-color" skin="panelBorderColor"/>
<u:style name="border-bottom-color" skin="panelBorderColor"/>
+ <u:style name="background" skin="additionalBackgroundColor"/>
<u:style name="text-align" value="center"/>
<u:style name="padding" value="2px"/>
<u:style name="white-space" value="nowrap"/>
@@ -391,22 +418,45 @@
</u:selector>
<u:selector name=".rich-calendar-editor-btn">
- <u:style name="width" value="40px" />
+ <u:style name="width" value="36px" />
<u:style name="padding" value="2px" />
+ <u:style name="margin" value="2px" />
<u:style name="text-align" value="center"/>
+ <u:style name="cursor" value="pointer"/>
</u:selector>
<u:selector name=".rich-calendar-editor-btn-over">
<u:style name="padding" value="1px" />
<u:style name="border" value="1px solid"/>
<u:style name="border-color" skin="panelBorderColor"/>
- <u:style name="cursor" value="pointer"/>
+ <u:style name="background" skin="calendarSpecBackgroundColor"/>
</u:selector>
<u:selector name=".rich-calendar-editor-btn-selected">
<u:style name="background-color" skin="calendarCurrentBackgroundColor" />
+ <u:style name="padding" value="2px" />
+ <u:style name="border" value="0px" />
<u:style name="color" skin="calendarCurrentTextColor" />
- <u:style name="font-weight" value="bold"/>
- </u:selector>
-
+ <u:style name="font-weight" value="bold"/>
+ <u:style name="cursor" value="default"/>
+ </u:selector>
+
+ <u:selector name=".rich-calendar-editor-tool-over">
+ <u:style name="padding" value="1px" />
+ <u:style name="border" value="1px solid"/>
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="border-color" skin="tableBackgroundColor"/>
+ <u:style name="border-right-color" skin="panelBorderColor"/>
+ <u:style name="border-bottom-color" skin="panelBorderColor"/>
+ </u:selector>
+
+ <u:selector name=".rich-calendar-editor-tool-press">
+ <u:style name="padding" value="1px" />
+ <u:style name="border" value="1px solid"/>
+ <u:style name="background" skin="additionalBackgroundColor"/>
+ <u:style name="border-color" skin="panelBorderColor"/>
+ <u:style name="border-right-color" skin="tableBackgroundColor"/>
+ <u:style name="border-bottom-color" skin="tableBackgroundColor"/>
+ </u:selector>
+
</f:template>
Modified: trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js
===================================================================
--- trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-01-11 12:43:31 UTC (rev 5299)
+++ trunk/ui/calendar/src/main/resources/org/richfaces/renderkit/html/scripts/calendar.js 2008-01-11 14:26:49 UTC (rev 5300)
@@ -891,31 +891,39 @@
createDECell: function(id, value, buttonType, param, className)
{
- var onclick = (buttonType==0 ? '$(\''+this.id+'\').component.scrollEditorYear('+param+');' :
- buttonType==1 ? '$(\''+this.id+'\').component.dateEditorSelectMonth('+param+');':
- '$(\''+this.id+'\').component.dateEditorSelectYear('+param+');' );
- return '<td><div id="'+id+'" class="rich-calendar-editor-btn'+(className ? ' '+className : '')+'" onmouseover="Element.addClassName(this, \'rich-calendar-editor-btn-over\');" onmouseout="Element.removeClassName(this, \'rich-calendar-editor-btn-over\');" onclick="'+onclick+'">'+value+'</div></td>';
+ if (buttonType==0)
+ {
+ return '<div id="'+id+'" class="rich-calendar-editor-btn'+(className ? ' '+className : '')+
+ '" onmouseover="this.className=\'rich-calendar-editor-btn rich-calendar-editor-tool-over\';" onmouseout="this.className=\'rich-calendar-editor-btn\';" onmousedown="this.className=\'rich-calendar-editor-btn rich-calendar-editor-tool-press\';" onmouseup="this.className=\'rich-calendar-editor-btn rich-calendar-editor-tool-over\';" onclick="$(\''+this.id+'\').component.scrollEditorYear('+param+');">'+value+'</div>';
+ }
+ else
+ {
+ var onclick = (buttonType==1 ? '$(\''+this.id+'\').component.dateEditorSelectMonth('+param+');':
+ '$(\''+this.id+'\').component.dateEditorSelectYear('+param+');' );
+ return '<div id="'+id+'" class="rich-calendar-editor-btn'+(className ? ' '+className : '')+
+ '" onmouseover="Element.addClassName(this, \'rich-calendar-editor-btn-over\');" onmouseout="Element.removeClassName(this,\'rich-calendar-editor-btn-over\');" onclick="'+onclick+'">'+value+'</div>';
+ }
},
createDateEditorLayout: function()
{
- var htmlBegin = '<table id="'+this.DATE_EDITOR_LAYOUT_ID+'" class="rich-calendar-time-layout" border="0" cellpadding="0" cellspacing="0"><tbody><tr id="'+this.DATE_EDITOR_LAYOUT_ID+'TR">';
+ var htmlBegin = '<table id="'+this.DATE_EDITOR_LAYOUT_ID+'" class="rich-calendar-date-layout" border="0" cellpadding="0" cellspacing="0"><tbody><tr id="'+this.DATE_EDITOR_LAYOUT_ID+'TR">';
var htmlEnd = '</tr></tbody></table>';
var month = 0;
this.dateEditorYear = this.getCurrentYear();
var year = this.dateEditorStartYear = this.dateEditorYear-4;
- var htmlContent = this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)
- +this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)
- +this.createDECell('','<', 0, -1)
- +this.createDECell('','>', 0, 1);
+ var htmlContent = '<td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)+'</td>'
+ +'<td class="rich-calendar-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)+'</td>'
+ +'<td>'+this.createDECell('','<', 0, -1)+'</td>'
+ +'<td>'+this.createDECell('','>', 0, 1)+'</td>';
month++;
for (var i=0;i<5;i++)
{
- htmlContent+='</tr><tr>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)
- +this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)
- +this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+i, year, 2, i, (i==4 ? 'rich-calendar-editor-btn-selected' : ''))
- +this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+(i+5), year+5, 2, i+5);
+ htmlContent+='</tr><tr><td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+month, this.params.monthLabelsShort[month], 1, month)+'</td>'
+ +'<td class="rich-calendar-date-layout-split">'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'M'+(month+6), this.params.monthLabelsShort[month+6], 1, month+6)+'</td>'
+ +'<td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+i, year, 2, i, (i==4 ? 'rich-calendar-editor-btn-selected' : ''))+'</td>'
+ +'<td>'+this.createDECell(this.DATE_EDITOR_LAYOUT_ID+'Y'+(i+5), year+5, 2, i+5)+'</td>';
month++;
year++;
}
@@ -923,9 +931,9 @@
this.dateEditorMonth = this.getCurrentMonth();
this.dateEditorMonthID = this.DATE_EDITOR_LAYOUT_ID+'M'+this.dateEditorMonth;
- htmlContent+='</tr><tr><td colspan="2" class="rich-calendar-time-layout-ok">'+
+ htmlContent+='</tr><tr><td colspan="2" class="rich-calendar-date-layout-ok">'+
'<div class="rich-calendar-time-btn" style="float:right;" onmousedown="Element.addClassName(this, \'rich-calendar-time-btn-press\');" onmouseout="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onmouseup="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onclick="$(\''+this.id+'\').component.hideDateEditor(true);">'+this.params.labels.ok+'</div>'+
- '</td><td colspan="2" class="rich-calendar-time-layout-cancel">'+
+ '</td><td colspan="2" class="rich-calendar-date-layout-cancel">'+
'<div class="rich-calendar-time-btn" style="float:left;" onmousedown="Element.addClassName(this, \'rich-calendar-time-btn-press\');" onmouseout="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onmouseup="Element.removeClassName(this, \'rich-calendar-time-btn-press\');" onclick="$(\''+this.id+'\').component.hideDateEditor(false);">'+this.params.labels.cancel+'</div>'+
'</td>';
@@ -1937,10 +1945,10 @@
hideEditor: function()
{
+ if (this.isTimeEditorLayoutCreated) $(this.TIME_EDITOR_LAYOUT_ID).hide();
+ if (this.isDateEditorLayoutCreated) $(this.DATE_EDITOR_LAYOUT_ID).hide();
$(this.EDITOR_ID).hide();
$(this.EDITOR_SHADOW_ID).hide();
- if (this.isTimeEditorLayoutCreated) $(this.TIME_EDITOR_LAYOUT_ID).hide();
- if (this.isDateEditorLayoutCreated) $(this.DATE_EDITOR_LAYOUT_ID).hide();
this.isEditorVisible = false;
},
17 years
JBoss Rich Faces SVN: r5299 - in trunk/sandbox/ui/combobox/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-01-11 07:43:31 -0500 (Fri, 11 Jan 2008)
New Revision: 5299
Modified:
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
Log:
add default background and disable background styles support
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-11 12:38:18 UTC (rev 5298)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/css/combobox.xcss 2008-01-11 12:43:31 UTC (rev 5299)
@@ -139,6 +139,12 @@
cursor : pointer;
}
+.rich-combobox-button-background-disabled {
+ background : top repeat-x;
+ cursor : pointer;
+}
+
+
.rich-combobox-button-pressed-background {
background : top repeat-x;
cursor : pointer;
@@ -163,6 +169,13 @@
<u:style name="background-color" skin="tabBackgroundColor"/>
</u:selector>
+ <u:selector name=".rich-combobox-button-background-disabled">
+ <u:style name="background-image">
+ <f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonGradient" />
+ </u:style>
+ <u:style name="background-color" skin="tabBackgroundColor"/>
+ </u:selector>
+
<u:selector name=".rich-combobox-button-pressed-background">
<u:style name="background-image">
<f:resource f:key="org.richfaces.renderkit.images.ComboBoxButtonPressGradient" />
@@ -190,8 +203,6 @@
<u:style name="border-color" skin="panelBorderColor"/>
</u:selector>
-
-
<u:selector name=".rich-combobox-button-hovered">
<u:style name="border-color" skin="selectControlColor"/>
</u:selector>
Modified: trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js
===================================================================
--- trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-11 12:38:18 UTC (rev 5298)
+++ trunk/sandbox/ui/combobox/src/main/resources/org/richfaces/renderkit/html/scripts/combobox.js 2008-01-11 12:43:31 UTC (rev 5299)
@@ -3,13 +3,14 @@
Richfaces.ComboBox.prototype = {
- initialize: function(combobox, listId, parentListId, fieldId, buttonId, classes, listWidth, listHeight, itemsText, directInputSuggestions, filterNewValue, selectFirstOnUpdate, onlistcall, onselected, defaultMessage, isDisabled) {
+ initialize: function(combobox, listId, parentListId, fieldId, buttonId,buttonBGId, classes, listWidth, listHeight, itemsText, directInputSuggestions, filterNewValue, selectFirstOnUpdate, onlistcall, onselected, defaultMessage, isDisabled) {
this.directInputSuggestions = directInputSuggestions;
this.filterNewValue = filterNewValue;
this.combobox = $(combobox);
this.field = $(fieldId);
this.button = $(buttonId);
+ this.buttonBG = $(buttonBGId);
var fieldDem = Richfaces.ComboBoxList.getElemXY(this.field);
fieldDem.height = this.field.offsetHeight;
this.comboList = new Richfaces.ComboBoxList(listId, parentListId, selectFirstOnUpdate, classes.COMBO_LIST, listWidth, listHeight, itemsText, onlistcall, fieldDem);
@@ -197,10 +198,12 @@
doActive : function() {
this.button.className = this.classes.BUTTON.CLASSES.ACTIVE;
this.field.className = this.classes.FIELD.CLASSES.ACTIVE;
+ this.buttonBG.className = this.classes.BUTTONBG.CLASSES.ACTIVE;
},
doDisable : function() {
this.button.className = this.classes.BUTTON.CLASSES.DISABLED;
+ this.buttonBG.className = this.classes.BUTTONBG.CLASSES.DISABLED;
this.field.className = this.classes.FIELD.CLASSES.DISABLED;
this.button.disabled = true;
@@ -209,6 +212,7 @@
doNormal : function() {
this.button.className = this.classes.BUTTON.CLASSES.NORMAL;
+ this.buttonBG.className = this.classes.BUTTONBG.CLASSES.NORMAL;
this.field.className = this.classes.FIELD.CLASSES.NORMAL;
this.button.disabled = false;
Modified: trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx
===================================================================
--- trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-11 12:38:18 UTC (rev 5298)
+++ trunk/sandbox/ui/combobox/src/main/templates/combobox.jspx 2008-01-11 12:43:31 UTC (rev 5299)
@@ -64,6 +64,9 @@
variables.setVariable("inputStyle", inputStyle);
Object inputClass = component.getAttributes().get("inputClass");
+ if(inputClass!=null && inputClass.equals("")) {
+ inputClass = null;
+ }
variables.setVariable("inputClass", inputClass);
Object inputDisabledStyle = component.getAttributes().get("inputDisabledStyle");
@@ -73,9 +76,15 @@
variables.setVariable("inputDisabledStyle", inputDisabledStyle);
Object inputDisabledClass = component.getAttributes().get("inputDisabledClass");
+ if(inputDisabledClass!=null && inputDisabledClass.equals("")) {
+ inputDisabledClass = null;
+ }
variables.setVariable("inputDisabledClass", inputDisabledClass);
Object buttonDisabledClass = component.getAttributes().get("buttonDisabledClass");
+ if(buttonDisabledClass!=null && buttonDisabledClass.equals("")) {
+ buttonDisabledClass = null;
+ }
variables.setVariable("buttonDisabledClass", buttonDisabledClass);
Object buttonDisabledStyle = component.getAttributes().get("buttonDisabledStyle");
@@ -85,6 +94,9 @@
variables.setVariable("buttonDisabledStyle", buttonDisabledStyle);
Object buttonClass = component.getAttributes().get("buttonClass");
+ if(buttonClass!=null && buttonClass.equals("")) {
+ buttonClass = null;
+ }
variables.setVariable("buttonClass", buttonClass);
Object buttonStyle = component.getAttributes().get("buttonStyle");
@@ -100,6 +112,9 @@
variables.setVariable("listStyle", listStyle);
Object listClass = component.getAttributes().get("listClass");
+ if(listClass!=null && listClass.equals("")) {
+ listClass = null;
+ }
variables.setVariable("listClass", listClass);
Object listDisabledStyle = component.getAttributes().get("listDisabledStyle");
@@ -109,6 +124,9 @@
variables.setVariable("listDisabledStyle", listDisabledStyle);
Object listDisabledClass = component.getAttributes().get("listDisabledClass");
+ if(listDisabledClass!=null && listDisabledClass.equals("")) {
+ listDisabledClass = null;
+ }
variables.setVariable("listDisabledClass", listDisabledClass);
Object styleClass = component.getAttributes().get("styleClass");
@@ -118,12 +136,21 @@
variables.setVariable("style", style);
Object itemClass = component.getAttributes().get("itemClass");
+ if(itemClass!=null && itemClass.equals("")) {
+ itemClass = null;
+ }
variables.setVariable("itemClass", itemClass);
Object itemDisabledClass = component.getAttributes().get("itemDisabledClass");
+ if(itemDisabledClass!=null && itemDisabledClass.equals("")) {
+ itemDisabledClass = null;
+ }
variables.setVariable("itemDisabledClass", itemDisabledClass);
Object itemSelectedClass = component.getAttributes().get("itemSelectedClass");
+ if(itemSelectedClass!=null && itemSelectedClass.equals("")) {
+ itemSelectedClass = null;
+ }
variables.setVariable("itemSelectedClass", itemSelectedClass);
@@ -131,7 +158,16 @@
</jsp:scriptlet>
<div id="#{clientId}" class="rich-combobox-font rich-combobox-shell #{styleClass}" style="width:#{listWidth}; #{style}">
- <input id="comboboxField#{clientId}" name="comboboxField#{clientId}" disabled="#{disabled}" class="rich-combobox-font-disabled rich-combobox-input-default-disabled rich-combobox-input-disabled #{inputDisabledClass}" type="text" value="#{value}" size="#{inputSize}" autocomplete="off" style="width:#{listWidth}; #{inputStyle}">
+ <input id="comboboxField#{clientId}"
+ name="comboboxField#{clientId}"
+ disabled="#{disabled}"
+ class="rich-combobox-font-disabled rich-combobox-input-default-disabled rich-combobox-input-disabled #{inputDisabledClass}" type="text"
+ value="#{value}"
+ size="#{inputSize}"
+ autocomplete="off"
+ style="width:#{listWidth}; #{inputStyle}"
+ x:passThruWithExclusions="value,name,type,id,styleClass,class,style,size,autocomplete,disabled"
+ >
</input>
<input id="comboBoxButtonBG#{clientId}" readonly="true" type="text" value="" class="rich-combobox-font rich-combobox-button-background rich-combobox-button">
</input>
@@ -161,7 +197,12 @@
{NORMAL: #{buttonDisabledStyle},
ACTIVE: #{buttonStyle},
DISABLED: #{buttonDisabledStyle}}
- },
+ },
+ BUTTONBG : {CLASSES :
+ {NORMAL:"rich-combobox-font-disabled rich-combobox-button-background-disabled rich-combobox-button-disabled",
+ ACTIVE: "rich-combobox-font rich-combobox-button-background rich-combobox-button",
+ DISABLED : "rich-combobox-font-disabled rich-combobox-button-background-disabled rich-combobox-button-disabled"}
+ },
FIELD : {CLASSES:
{NORMAL : "rich-combobox-font-disabled rich-combobox-input-default-disabled rich-combobox-input-disabled #{inputDisabledClass}",
ACTIVE : "rich-combobox-font rich-combobox-input-default rich-combobox-input #{inputClass}",
@@ -189,7 +230,9 @@
"list#{clientId}",
"listParent#{clientId}",
"comboboxField#{clientId}",
- "comboboxButton#{clientId}", Richfaces.ComboBox.CLASSES,
+ "comboboxButton#{clientId}",
+ "comboBoxButtonBG#{clientId}",
+ Richfaces.ComboBox.CLASSES,
"#{listWidth}", "#{listHeight}",
#{this:getItemsTextAsJSArray(context, component)},
#{directInputSuggestions},
17 years
JBoss Rich Faces SVN: r5298 - management/design/comboBox/markup.
by richfaces-svn-commits＠lists.jboss.org
Author: admitriev
Date: 2008-01-11 07:38:18 -0500 (Fri, 11 Jan 2008)
New Revision: 5298
Added:
management/design/comboBox/markup/ComboBox_Iframe.html
Log:
Added: management/design/comboBox/markup/ComboBox_Iframe.html
===================================================================
--- management/design/comboBox/markup/ComboBox_Iframe.html (rev 0)
+++ management/design/comboBox/markup/ComboBox_Iframe.html 2008-01-11 12:38:18 UTC (rev 5298)
@@ -0,0 +1,70 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+
+<html>
+<head>
+ <title>Untitled</title>
+<style>
+.cb_width_field{ width : 150px;}
+.cb_width_list{ width : 250px;}
+.cb_font{ font-size : 11px/*generalSizeFont*/; font-family : arial/*generalFamilyFont*/; color : #000000/*generalTextColor*/}
+.cb_shell{ position : relative;}
+.cb_field{ position : absolute; top : 0px; left : 0; padding-right :20px; padding-left :3px; margin : 0px; border : 1px solid #c0c0c0; background-image: url(SpinnerFieldGradient.gif); background-position:left top;
+background-repeat:repeat-x; border-color: #BED6F8 rgb(255, 255, 255) #BED6F8 rgb(190, 214, 248); } /*panelBorderColor*/
+.cb_strut{ position : relative; visibility : hidden; margin : 0px; padding : 2px;}
+.cb_button{ position : absolute; top : 0px; right : 0; width : 17px; margin : 0px; border : 1px solid #c0c0c0; border-color: #BED6F8 rgb(190, 214, 248) #BED6F8 rgb(190, 214, 248); } /*panelBorderColor*/
+.cb_button_bg{ background : url(images/bg_btn.png) top repeat-x #C7D7EC;} /*gradient - from generalBackgroundColor to tabBackgroundColor, background-color - tabBackgroundColor*/
+.cb_button_bg_press{ background : url(images/bg_press.png) repeat-x bottom #C7D7EC} /*gradient - from tabBackgroundColor to generalBackgroundColor, background-color - tabBackgroundColor*/
+.cb_button_arrow{ background : url(images/down.gif) center no-repeat; cursor : pointer;}
+.cb_button_select{ border : 1px solid #E79A00;} /*selectControlColor*/
+
+.cb_list_cord{ position : relative; font-size : 0px;d!isplay : none}/*DDL is hidden!!!!!*/
+.cb_list_position{ position : absolute; top:-5px; left:0px;}
+.cb_list_decoration{border : 1px solid #BED6F8 /*panelBorderColor*/; padding : 0px; background : #FFFFFF; /*tableBackgroundColor*/}
+.cb_list_scroll{ overflow : auto; overflow-x : hidden; height : 100;}
+.cb_option{ padding : 2px; white-space : nowrap;}
+.cb_select{ padding : 1px; width : 100%; background-color: #DFE8F6; border : 1px dotted #a3bae9;/*generalTextColor*/}
+</style>
+</head>
+
+<body style="margin : 30px">
+
+<select class="cb_font cb_width">
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+ <option>Item<option>
+</select>
+ <br><br>
+<div class="cb_width_list cb_font cb_shell">
+ <div class="cb_width_field cb_font cb_shell">
+ <input type="Text" value="Input text or select option" class="cb_width_field cb_font cb_field">
+ <input readonly="" type="Text" value="" class="cb_button cb_font cb_button_bg">
+ <input readonly="" type="Text" value="" class="cb_button cb_font cb_button_arrow" onmouseover="this.className='cb_button cb_font cb_button_arrow cb_button_select'" onmouseout="this.className='cb_button cb_font cb_button_arrow'">
+ <input type="Text"class="cb_width_field cb_strut cb_font">
+ </div><div class="cb_list_cord">
+ <iframe class="cb_width_list cb_list_scroll cb_list_position" frameborder="0"></iframe>
+ <div class="cb_list_position cb_width_list">
+ <div class="cb_list_decoration">
+ <div class="cb_list_scroll">
+ <div class="cb_option cb_font">Option 1</div>
+ <div class="cb_option cb_font">Option 2</div>
+ <div class="cb_option cb_font">Option 3</div>
+ <div class="cb_option cb_font">Option 4</div>
+ <div class="cb_option cb_font cb_select">Opt</div>
+ <div class="cb_option cb_font">Option 6</div>
+ <div class="cb_option cb_font">Option 7</div>
+ <div class="cb_option cb_font">Option 8</div>
+ <div class="cb_option cb_font">Option 9</div>
+ <div class="cb_option cb_font">Option 0</div>
+ </div>
+ </div>
+ </div>
+ </div>
+</div>
+
+
+
+
+</body>
+</html>
17 years
JBoss Rich Faces SVN: r5297 - trunk/docs/userguide/en/src/main/docbook/included.
by richfaces-svn-commits＠lists.jboss.org
Author: artdaw
Date: 2008-01-11 07:11:31 -0500 (Fri, 11 Jan 2008)
New Revision: 5297
Modified:
trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
Log:
http://jira.jboss.com/jira/browse/RF-1008 - add scale attribute in order to decrease the size of screenshot
Modified: trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml
===================================================================
--- trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2008-01-11 12:10:22 UTC (rev 5296)
+++ trunk/docs/userguide/en/src/main/docbook/included/scrollableDataTable.xml 2008-01-11 12:11:31 UTC (rev 5297)
@@ -451,7 +451,7 @@
<mediaobject>
<imageobject>
- <imagedata fileref="images/sdt.png"/>
+ <imagedata fileref="images/sdt.png" scale="90"/>
</imageobject>
</mediaobject>
</figure>
17 years