JBoss Rich Faces SVN: r1147 - trunk/docs/userguide.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-06-12 14:08:46 -0400 (Tue, 12 Jun 2007)
New Revision: 1147
Modified:
trunk/docs/userguide/pom.xml
Log:
Include documentation project into distribution build.
Modified: trunk/docs/userguide/pom.xml
===================================================================
--- trunk/docs/userguide/pom.xml 2007-06-12 17:52:49 UTC (rev 1146)
+++ trunk/docs/userguide/pom.xml 2007-06-12 18:08:46 UTC (rev 1147)
@@ -201,7 +201,7 @@
${basedir}/src/main/docbook
</sourceDirectory>
<targetDirectory>
- ${project.build.directory}/docs
+ ${project.build.outputDirectory}
</targetDirectory>
<sourceDocumentName>
master.xml
17 years, 7 months
JBoss Rich Faces SVN: r1146 - trunk/docs.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-06-12 13:52:49 -0400 (Tue, 12 Jun 2007)
New Revision: 1146
Modified:
trunk/docs/pom.xml
Log:
Include documentation project into distribution build.
Modified: trunk/docs/pom.xml
===================================================================
--- trunk/docs/pom.xml 2007-06-12 17:43:11 UTC (rev 1145)
+++ trunk/docs/pom.xml 2007-06-12 17:52:49 UTC (rev 1146)
@@ -1,9 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
<parent>
- <artifactId>master</artifactId>
+ <artifactId>richfaces-parent</artifactId>
<groupId>org.richfaces</groupId>
<version>3.0.2-SNAPSHOT</version>
+ <relativePath>../richfaces/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
<groupId>org.richfaces</groupId>
17 years, 7 months
JBoss Rich Faces SVN: r1145 - in trunk: richfaces/assembly and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alexsmirnov
Date: 2007-06-12 13:43:11 -0400 (Tue, 12 Jun 2007)
New Revision: 1145
Modified:
trunk/pom.xml
trunk/richfaces/assembly/pom.xml
trunk/richfaces/assembly/src/main/assembly/richfaces.xml
Log:
Include documentation project into distribution build.
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2007-06-12 16:11:51 UTC (rev 1144)
+++ trunk/pom.xml 2007-06-12 17:43:11 UTC (rev 1145)
@@ -9,6 +9,7 @@
<dependencies />
<modules>
<module>richfaces</module>
+ <module>docs</module>
<module>richfaces-samples</module>
<!--
<module>sandbox</module>
Modified: trunk/richfaces/assembly/pom.xml
===================================================================
--- trunk/richfaces/assembly/pom.xml 2007-06-12 16:11:51 UTC (rev 1144)
+++ trunk/richfaces/assembly/pom.xml 2007-06-12 17:43:11 UTC (rev 1145)
@@ -93,6 +93,44 @@
</executions>
</plugin>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>unpack</id>
+ <phase>generate-resources</phase>
+ <goals>
+ <goal>unpack</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.richfaces.docs.userguide</groupId>
+ <artifactId>
+ en
+ </artifactId>
+ <version>
+ ${project.version}
+ </version>
+ <outputDirectory>
+ ${project.build.directory}/docs/userguide/en
+ </outputDirectory>
+ </artifactItem>
+ </artifactItems>
+ <outputDirectory>
+ ${project.build.directory}/docs
+ </outputDirectory>
+ <overWriteReleases>
+ false
+ </overWriteReleases>
+ <overWriteSnapshots>
+ true
+ </overWriteSnapshots>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
<artifactId>maven-assembly-plugin</artifactId>
<configuration>
<outputDirectory>${project.build.directory}/dist</outputDirectory>
Modified: trunk/richfaces/assembly/src/main/assembly/richfaces.xml
===================================================================
--- trunk/richfaces/assembly/src/main/assembly/richfaces.xml 2007-06-12 16:11:51 UTC (rev 1144)
+++ trunk/richfaces/assembly/src/main/assembly/richfaces.xml 2007-06-12 17:43:11 UTC (rev 1145)
@@ -32,10 +32,10 @@
<directory>target/tlddoc</directory>
<outputDirectory>tlddoc</outputDirectory>
</fileSet>
-<!-- <fileSet>
- <directory>target/src</directory>
- <outputDirectory>src</outputDirectory>
- </fileSet> -->
+ <fileSet>
+ <directory>target/docs</directory>
+ <outputDirectory>docs</outputDirectory>
+ </fileSet>
</fileSets>
<dependencySets>
<dependencySet>
17 years, 7 months
JBoss Rich Faces SVN: r1144 - trunk/sandbox/scrollable-grid/src/main/config/component.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-06-12 12:11:51 -0400 (Tue, 12 Jun 2007)
New Revision: 1144
Modified:
trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml
Log:
Added CSS for selection.
Modified: trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-06-12 16:11:35 UTC (rev 1143)
+++ trunk/sandbox/scrollable-grid/src/main/config/component/scrollable-grid.xml 2007-06-12 16:11:51 UTC (rev 1144)
@@ -94,6 +94,16 @@
<defaultvalue>true</defaultvalue>
</property>
+ <property>
+ <name>selectedClass</name>
+ <classname>java.lang.String</classname>
+ </property>
+
+ <property>
+ <name>activeClass</name>
+ <classname>java.lang.String</classname>
+ </property>
+
&ui_component_attributes;
&html_style_attributes;
</component>
17 years, 7 months
JBoss Rich Faces SVN: r1143 - in trunk/sandbox/scrollable-grid/src/main: javascript/ClientUI/controls/grid and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2007-06-12 12:11:35 -0400 (Tue, 12 Jun 2007)
New Revision: 1143
Modified:
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Selection.js
trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss
Log:
Added CSS for selection.
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2007-06-12 15:42:00 UTC (rev 1142)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/SelectionRendererContributor.java 2007-06-12 16:11:35 UTC (rev 1143)
@@ -152,6 +152,8 @@
ScriptOptions scriptOptions = new ScriptOptions(component);
scriptOptions.addOption("selectionInput", getSelectionInputName(
context, (UIScrollableGrid) component));
+ scriptOptions.addOption("selectedClass", component.getAttributes().get("selectedClass"));
+ scriptOptions.addOption("activeClass", component.getAttributes().get("activeClass"));
return scriptOptions;
}
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Selection.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Selection.js 2007-06-12 15:42:00 UTC (rev 1142)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/Selection.js 2007-06-12 16:11:35 UTC (rev 1143)
@@ -194,6 +194,8 @@
this.selection = new ClientUI.controls.grid.Selection();
this.inputElement = grid.options.selectionInput;
+ this.selectedClass = grid.options.selectedClass;
+ this.activeClass = grid.options.activeClass;
this.restoreState();
this.setListeners();
@@ -233,8 +235,12 @@
while(j <= this.selection.ranges[i].indexes[1]) {
var fElement = $(this.prefix + ":f:" + j);
var nElement = $(this.prefix + ":n:" + j);
- fElement.style.backgroundColor = "#DDDDFF";
- nElement.style.backgroundColor = "#DDDDFF";
+ Element.addClassName(fElement, "idg_row_selected_h");
+ Element.addClassName(nElement, "idg_row_selected_h");
+ Element.addClassName(fElement, "idg_row_selected");
+ Element.addClassName(nElement, "idg_row_selected");
+ Element.addClassName(fElement, this.selectedClass);
+ Element.addClassName(nElement, this.selectedClass);
j++;
}
i++;
@@ -428,16 +434,24 @@
this.selection.addId(rowIndex);
var fElement = $(this.prefix + ":f:" + rowIndex);
var nElement = $(this.prefix + ":n:" + rowIndex);
- fElement.style.backgroundColor = "#DDDDFF";
- nElement.style.backgroundColor = "#DDDDFF";
+ Element.addClassName(fElement, "idg_row_selected_h");
+ Element.addClassName(nElement, "idg_row_selected_h");
+ Element.addClassName(fElement, "idg_row_selected");
+ Element.addClassName(nElement, "idg_row_selected");
+ Element.addClassName(fElement, this.selectedClass);
+ Element.addClassName(nElement, this.selectedClass);
},
removeRowFromSelection: function(rowIndex) {
this.selection.removeId(rowIndex);
var fElement = $(this.prefix + ":f:" + rowIndex);
var nElement = $(this.prefix + ":n:" + rowIndex);
- fElement.style.backgroundColor = "#FFFFFF";
- nElement.style.backgroundColor = "#FFFFFF";
+ Element.removeClassName(fElement, "idg_row_selected_h");
+ Element.removeClassName(nElement, "idg_row_selected_h");
+ Element.removeClassName(fElement, "idg_row_selected");
+ Element.removeClassName(nElement, "idg_row_selected");
+ Element.removeClassName(fElement, this.selectedClass);
+ Element.removeClassName(nElement, this.selectedClass);
},
setActiveRow: function(rowIndex) {
@@ -445,13 +459,21 @@
if(this.activeRow != null) {
fElement = $(this.prefix + ":f:" + this.activeRow);
nElement = $(this.prefix + ":n:" + this.activeRow);
- fElement.style.color = "#000000";
- nElement.style.color = "#000000";
+ Element.removeClassName(fElement, "idg_row_active_h");
+ Element.removeClassName(nElement, "idg_row_active_h");
+ Element.removeClassName(fElement, "idg_row_active");
+ Element.removeClassName(nElement, "idg_row_active");
+ Element.removeClassName(fElement, this.activeClass);
+ Element.removeClassName(nElement, this.activeClass);
}
fElement = $(this.prefix + ":f:" + rowIndex);
nElement = $(this.prefix + ":n:" + rowIndex);
- fElement.style.color = "#0000AA";
- nElement.style.color = "#0000AA";
+ Element.addClassName(fElement, "idg_row_active_h");
+ Element.addClassName(nElement, "idg_row_active_h");
+ Element.addClassName(fElement, "idg_row_active");
+ Element.addClassName(nElement, "idg_row_active");
+ Element.addClassName(fElement, this.activeClass);
+ Element.addClassName(nElement, this.activeClass);
this.activeRow = rowIndex;
}
});
Modified: trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss 2007-06-12 15:42:00 UTC (rev 1142)
+++ trunk/sandbox/scrollable-grid/src/main/resources/org/richfaces/renderkit/html/css/grid.xcss 2007-06-12 16:11:35 UTC (rev 1143)
@@ -286,6 +286,15 @@
box-sizing: border-box;
-moz-box-sizing: border-box;
}
+
+.idg_row_selected_h {
+ background-color: #DDDDFF;
+}
+
+.idg_row_active_h {
+ color : #0000AA;
+}
+
.ClientUI_Grid_BROdd {
background-color: #FFFFFF;
font: normal 8pt arial;
17 years, 7 months
JBoss Rich Faces SVN: r1142 - trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-06-12 11:42:00 -0400 (Tue, 12 Jun 2007)
New Revision: 1142
Modified:
trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js
Log:
http://jira.jboss.com/jira/browse/RF-49 fixed
Modified: trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js
===================================================================
--- trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js 2007-06-12 15:39:45 UTC (rev 1141)
+++ trunk/richfaces/tabPanel/src/main/resources/org/richfaces/renderkit/html/scripts/tabPanel.js 2007-06-12 15:42:00 UTC (rev 1142)
@@ -153,11 +153,13 @@
if (lastActive && newActive) {
if (lastActive.ontableave && lastActive.ontableave != "") {
var func = new Function("leftTabName","enteredTabName",lastActive.ontableave);
- if (!func(lastActive.name,newActive.name)) return false;
+ var result = func(lastActive.name,newActive.name);
+ if (typeof(result) == 'boolean' && !result) return false;
}
if (newActive.ontabenter && newActive.ontabenter != "") {
var func = new Function("leftTabName","enteredTabName",newActive.ontabenter);
- return func(lastActive.name,newActive.name);
+ var result = func(lastActive.name,newActive.name);
+ if (typeof(result) == 'boolean' && !result) return false;
}
}
return true;
17 years, 7 months
JBoss Rich Faces SVN: r1141 - in trunk/sandbox/scrollable-grid/src/main: javascript and 3 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dmorozov
Date: 2007-06-12 11:39:45 -0400 (Tue, 12 Jun 2007)
New Revision: 1141
Modified:
trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/Utils.js
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js
trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
Log:
Rollback changes
Modified: trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-12 15:15:25 UTC (rev 1140)
+++ trunk/sandbox/scrollable-grid/src/main/java/org/richfaces/renderkit/html/ScrollableGridBaseRenderer.java 2007-06-12 15:39:45 UTC (rev 1141)
@@ -659,7 +659,7 @@
state.setFrozenColumnCount(GridUtils.getFrozenColumnsCount(grid));
ColumnWalker.iterateOverColumns(context, grid, columnsWidthCounter, null, state);
ComponentVariables variables = ComponentsVariableResolver.getVariables(this, grid);
- int sumWidth = state.getSumWidth() + 1020;
+ int sumWidth = state.getSumWidth() + 200;
variables.setVariable("sumWidth", new Integer(sumWidth));
}
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/Utils.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/Utils.js 2007-06-12 15:15:25 UTC (rev 1140)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/common/utils/Utils.js 2007-06-12 15:39:45 UTC (rev 1141)
@@ -98,10 +98,12 @@
}
src = row;
+ target.parentNode.replaceChild(src, target);
} else {
-
- src = document.importNode(src, true);
+ target.innerHTML = src.innerHTML;
+ src = target;
+ //src = document.importNode(src, true);
}
@@ -110,7 +112,6 @@
//src = importProvider.importNode(src, true);
- target.parentNode.replaceChild(src, target);
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-06-12 15:15:25 UTC (rev 1140)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUI/controls/grid/GridBody.js 2007-06-12 15:39:45 UTC (rev 1141)
@@ -7,7 +7,7 @@
ClientUILib.requireClass("ClientUI.common.box.Box");
ClientUILib.requireClass("ClientUI.common.box.SplashBox");
-ClientUILib.requireClass("ClientUI.controls.grid.DataCash");
+//ClientUILib.requireClass("ClientUI.controls.grid.DataCash");
/*
* GridHeader.js - Grid control header pane
@@ -166,13 +166,13 @@
this.parseTemplate(this.templFrozen.getElement(), this.templNormal.getElement());
// init cash with initial data
- var cash = this.getCash();
+ /*var cash = this.getCash();
var frows = this.templFrozen.getElement().rows;
var nrows = this.templNormal.getElement().rows;
var count = this.rowsCount;
for(var i=0; i<count; i++) {
cash.setRow(i, {f: frows[i].innerHTML, n: nrows[i].innerHTML});
- }
+ }*/
this.controlCreated = true;
},
@@ -494,7 +494,7 @@
rearrangeRows: function(options, updateCash, showContainer) {
var frozenTbl = this.templFrozen.getElement();
var normalTbl = this.templNormal.getElement();
- var cash = this.getCash();
+ //var cash = this.getCash();
if(options.switchType === 0) {
var visibleRowPos = this.defaultRowHeight * options.index;
@@ -503,7 +503,7 @@
this.templFrozen.moveToY(visibleRowPos);
this.templNormal.moveToY(visibleRowPos);
- if(updateCash) {
+ /*if(updateCash) {
var frows = frozenTbl.rows;
var nrows = normalTbl.rows;
var count = frows.length;
@@ -511,7 +511,7 @@
for(var i=0; i<count; i++) {
cash.setRow(index+i, {f: frows[i].innerHTML, n: nrows[i].innerHTML});
}
- }
+ }*/
this.forceReRender();
}
@@ -531,9 +531,9 @@
for(i=0; i<options.count; i++) {
frows[j] = frozenTbl.rows[i];
nrows[j] = normalTbl.rows[i];
- if(updateCash) {
+ /*if(updateCash) {
cash.setRow(index+i, {f: frows[j].innerHTML, n: nrows[j].innerHTML});
- }
+ }*/
j++;
}
}
@@ -541,9 +541,9 @@
for(i=this.rowsCount - options.count; i<this.rowsCount; i++) {
frows[j] = frozenTbl.rows[i];
nrows[j] = normalTbl.rows[i];
- if(updateCash) {
+ /*if(updateCash) {
cash.setRow(index+j, {f: frows[j].innerHTML, n: nrows[j].innerHTML});
- }
+ }*/
j++;
}
for(i=0; i<this.rowsCount - options.count; i++) {
@@ -586,7 +586,7 @@
this.templNormal.moveToY(visibleRowPos);
}
else {
- if(updateCash) {
+ /*if(updateCash) {
var frows = frozenTbl.rows;
var nrows = normalTbl.rows;
var count = frows.length;
@@ -594,7 +594,7 @@
for(var i=0; i<count; i++) {
cash.setRow(index+i, {f: frows[i].innerHTML, n: nrows[i].innerHTML});
}
- }
+ }*/
var visibleRowPos = this.currRange.start * this.defaultRowHeight;
if(showContainer) this._showContainer();
this.templFrozen.moveToY(visibleRowPos);
@@ -640,7 +640,7 @@
this.adjustDataPosition(this.processedPos);
}
},*/
- getCash: function() {
+ /*getCash: function() {
if(!this.cash) {
this.cash = new ClientUI.controls.grid.DataCash(this.grid.dataModel.getCount());
}
@@ -680,7 +680,7 @@
this.updateStarted = false;
}.bind(this), 10);
- },
+ },*/
processCashedValues: function(options) {
return options;
Modified: trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js 2007-06-12 15:15:25 UTC (rev 1140)
+++ trunk/sandbox/scrollable-grid/src/main/javascript/ClientUILib.js 2007-06-12 15:39:45 UTC (rev 1141)
@@ -201,7 +201,7 @@
}
};
-ClientUILib.load(true);
+ClientUILib.load();
// declare predefined packages
var ClientUI = {
Modified: trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx
===================================================================
--- trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-06-12 15:15:25 UTC (rev 1140)
+++ trunk/sandbox/scrollable-grid/src/main/templates/org/richfaces/scrollable-grid.jspx 2007-06-12 15:39:45 UTC (rev 1141)
@@ -60,7 +60,7 @@
renderCols(context, component, false);
]]>
</jsp:scriptlet>
- <col width="1000px" />
+ <col width="100px" />
<tbody>
<tr class="ClientUI_Grid_HR">
<jsp:scriptlet>
@@ -68,7 +68,7 @@
renderHeaders(context, component, false);
]]>
</jsp:scriptlet>
- <td style="width: 1000px"></td>
+ <td style="width: 100px"></td>
</tr>
</tbody>
</table>
17 years, 7 months
JBoss Rich Faces SVN: r1140 - in trunk/richfaces: modal-panel/src/main/templates/org/richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: sergeyhalipov
Date: 2007-06-12 11:15:25 -0400 (Tue, 12 Jun 2007)
New Revision: 1140
Modified:
trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss
Log:
http://jira.jboss.com/jira/browse/RF-205
Modified: trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss
===================================================================
--- trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2007-06-12 15:03:18 UTC (rev 1139)
+++ trunk/richfaces/modal-panel/src/main/resources/org/richfaces/renderkit/html/css/modalPanel.xcss 2007-06-12 15:15:25 UTC (rev 1140)
@@ -28,6 +28,7 @@
position: fixed;
margin: 0;
padding: 0;
+ background-color: inherit;
}
.dr-mpnl-resizer {
@@ -57,6 +58,7 @@
border-width: 1px;
border-style: solid;
padding : 1px;
+ background-color: inherit;
}
.dr-mpnl-pnl-h{
Modified: trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx
===================================================================
--- trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-06-12 15:03:18 UTC (rev 1139)
+++ trunk/richfaces/modal-panel/src/main/templates/org/richfaces/htmlModalPanel.jspx 2007-06-12 15:15:25 UTC (rev 1140)
@@ -33,7 +33,7 @@
<f:call name="initializeResources" />
<div id="#{clientId}Container"
- style="position: absolute; display: none; z-index: #{component.zindex};"
+ style="position: absolute; display: none; z-index: #{component.zindex}; background-color: inherit;"
class="rich-modalpanel"
x:passThruWithExclusions="id,style,class"
>
Modified: trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss
===================================================================
--- trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss 2007-06-12 15:03:18 UTC (rev 1139)
+++ trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/css/suggestionbox.xcss 2007-06-12 15:15:25 UTC (rev 1140)
@@ -9,6 +9,7 @@
.dr-sb-common-container {
position: absolute;
text-align: left;
+ background-color: inherit;
}
.dr-sb-ext-decor-1 {
17 years, 7 months
JBoss Rich Faces SVN: r1139 - trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits＠lists.jboss.org
Author: a.izobov
Date: 2007-06-12 11:03:18 -0400 (Tue, 12 Jun 2007)
New Revision: 1139
Modified:
trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
Log:
http://jira.jboss.com/jira/browse/RF-62 fixed
Modified: trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js
===================================================================
--- trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-06-12 14:54:01 UTC (rev 1138)
+++ trunk/richfaces/suggestionbox/src/main/resources/org/richfaces/renderkit/html/scripts/suggestionbox.js 2007-06-12 15:03:18 UTC (rev 1139)
@@ -452,6 +452,7 @@
} else {
this.element.value = value;
}
+ this.oldValue = this.element.value;
this.element.focus();
if (this.options.afterUpdateElement)
@@ -508,7 +509,7 @@
var oldValue = this.element.value;
if (this.getToken().length >= this.options.minChars) {
LOG.debug("Call data for update choices");
- if (this.oldValue != oldValue && oldValue.length > 0) {
+ if ((event.keyCode == Event.KEY_DOWN || this.oldValue != oldValue) && oldValue.length > 0) {
this.startIndicator();
this.getUpdatedChoices(event);
}
17 years, 7 months
JBoss Rich Faces SVN: r1138 - in trunk/richfaces/panelbar/src/main: resources/org/richfaces/renderkit/html/scripts and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: A.Skokov
Date: 2007-06-12 10:54:01 -0400 (Tue, 12 Jun 2007)
New Revision: 1138
Modified:
trunk/richfaces/panelbar/src/main/config/component/panelbar.xml
trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
trunk/richfaces/panelbar/src/main/templates/panelBar.jspx
Log:
http://jira.jboss.com/jira/browse/RF-51
Modified: trunk/richfaces/panelbar/src/main/config/component/panelbar.xml
===================================================================
--- trunk/richfaces/panelbar/src/main/config/component/panelbar.xml 2007-06-12 13:53:13 UTC (rev 1137)
+++ trunk/richfaces/panelbar/src/main/config/component/panelbar.xml 2007-06-12 14:54:01 UTC (rev 1138)
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE components PUBLIC "-//AJAX4JSF//CDK Generator config/EN" "https://ajax4jsf.dev.java.net/nonav/dtds/component-config.dtd" >
-<!--
+<!--
<!DOCTYPE components PUBLIC "-//EXADEL//Generator config/EN" "http://exadel.com/dtds/component-config.dtd" >
-->
<components>
@@ -49,7 +49,7 @@
<description>
A ValueExpression enabled attribute that, if present, will be used as the text of the validator message, replacing any message that comes from the validator
</description>
- </property>
+ </property>
<property>
<name>width</name>
<classname>java.lang.String</classname>
@@ -98,7 +98,7 @@
<description>
Id of Converter to be used or reference to a Converter
</description>
- </property>
+ </property>
<property hidden="true">
<name>localValueSet</name>
<classname>boolean</classname>
@@ -107,8 +107,12 @@
<name>switchType</name>
<classname>java.lang.String</classname>
</property>
-
-
+ <property>
+ <name>onclick</name>
+ <classname>java.lang.String</classname>
+ <description>JavaScript code for call before header onclick</description>
+ </property>
+
&ui_component_attributes;
&header_component_attributes;
&content_component_attributes;
@@ -140,7 +144,7 @@
<superclass>org.ajax4jsf.framework.taglib.HtmlComponentTagBase</superclass>
<description>A child component of a slide panel component</description>
</tag>
-
+
<property>
<name>label</name>
<classname>java.lang.String</classname>
@@ -158,8 +162,8 @@
<classname>java.lang.String</classname>
<description>The component header style class active</description>
</property>
-
- &ui_component_attributes;
+
+ &ui_component_attributes;
&header_component_attributes;
&content_component_attributes;
<property hidden="true">
Modified: trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
===================================================================
--- trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2007-06-12 13:53:13 UTC (rev 1137)
+++ trunk/richfaces/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2007-06-12 14:54:01 UTC (rev 1138)
@@ -5,8 +5,8 @@
Exadel.PanelBar.prototype = {
- initialize: function(panelId) {
-
+ initialize: function(panelId, onclick) {
+
this.FF = (RichFaces.navigatorType() == "FF")?true:false;
this.isIE = ((navigator.userAgent.toLowerCase().indexOf("msie")!=-1) || (navigator.userAgent.toLowerCase().indexOf("explorer")!=-1))?true:false;
this.panel=$(panelId); //+"_p"
@@ -19,21 +19,21 @@
this.STEP=0;
this.slides=new Array();
this.ch=this.panel.clientHeight;
- this._attachBehaviors();
-
+
+ this.onclick = onclick;
+ this._attachBehaviors();
+
this.input=$(panelId+"_panelBarInput");
this.defaultIndex=this.findPanelById($F(panelId+"_panelBarInput"));
-
+
Event.observe(window,'load',this.handleOnLoad.bindAsEventListener(this));
-
- this.showSlide(this.slides[this.defaultIndex]);
+ this.showSlide(this.slides[this.defaultIndex]);
- this.contentHight = -1;
-
- },
-
+ this.contentHight = -1;
+ },
+
handleOnLoad: function() {
if ( this.timer ){
clearTimeout(this.timer);
@@ -42,19 +42,19 @@
this.contentHight = -1;
this.timer = setTimeout(this.handleOnLoad.bind(this), 100);
}
-
-
- this.showSlide(this.slides[this.defaultIndex]);
+
+
+ this.showSlide(this.slides[this.defaultIndex]);
},
getContentHeight: function() {
-
+
if(this.contentHight) {
}
else{
this.contentHight = -1;
}
-
+
if(this.contentHight <= -1) {
var h=0;
this.hclient=0;
@@ -66,7 +66,7 @@
this.hclient=h;
this.contentHight = this.panel.clientHeight-h;
}
-
+
return this.contentHight;
},
@@ -86,18 +86,18 @@
this.input.value=this.current.item.id;
},
-
+
_attachBehaviors: function() {
var rows=this._getDirectChildrenByTag(this.panel,'DIV');
for(var i=0; i<rows.length; i++) {
var subrows=this._getDirectChildrenByTag(rows[i],'DIV');
- this.slides.push(new Exadel.PanelBar.Slide(this,rows[i],subrows[0],subrows[1],subrows[2],i)); //ndex
+ this.slides.push(new Exadel.PanelBar.Slide(this,rows[i],subrows[0],subrows[1],subrows[2],i,this.onclick)); //ndex
}
},
_getDirectChildrenByTag: function( e, tagName ) {
-
+
var kids = new Array();
var allKids = e.childNodes;
for( var i = 0 ; i < allKids.length ; i++ ) {
@@ -109,21 +109,21 @@
return kids;
},
-
+
findPanelById: function(value) {
for(var i = 0; i<this.slides.length; i++) {
if (this.slides[i].item.id==value) return i;
}
return 0;
}
-
+
}
Exadel.PanelBar.Slide = Class.create();
Exadel.PanelBar.Slide.prototype = {
- initialize: function(slidePanel,item,header,header_act,content,index){
+ initialize: function(slidePanel,item,header,header_act,content,index,onclick){
this.index=index;
this.slidePanel=slidePanel;
@@ -153,31 +153,40 @@
}
}
-
+ if (onclick && onclick != ""){
+ this.onclickFunction = new Function("return " + onclick + ";").bindAsEventListener(this);
+ }
},
showContent: function() {
this.content.style.display="block";
this.content.firstChild.style.height="";
this.header.style.display="none";
- this.header_act.style.display="";
-
+ this.header_act.style.display="";
+
},
hideContent: function() {
this.content.style.display="none";
this.content.firstChild.style.height="100%";
},
-
+
hideHeader: function() {
this.header_act.style.display="none";
- this.header.style.display="";
+ this.header.style.display="";
},
headerOnClick: function() {
- if (this.content.style.display=="block") return;
+ if (this.onclickFunction){
+ var result = this.onclickFunction();
+ if (result != undefined && !result) {
+ return;
+ }
+ }
+
+ if (this.content.style.display=="block") return;
//this.header.style.display="none";
- //this.header_act.style.display="";
+ //this.header_act.style.display="";
this.slidePanel.showSlide(this);
this.slidePanel.panel.style.maxHeight="";
this.slidePanel.panel.style.minHeight="";
Modified: trunk/richfaces/panelbar/src/main/templates/panelBar.jspx
===================================================================
--- trunk/richfaces/panelbar/src/main/templates/panelBar.jspx 2007-06-12 13:53:13 UTC (rev 1137)
+++ trunk/richfaces/panelbar/src/main/templates/panelBar.jspx 2007-06-12 14:54:01 UTC (rev 1138)
@@ -9,18 +9,18 @@
class="org.richfaces.renderkit.html.PanelBarRenderer"
baseclass="org.richfaces.renderkit.html.PanelBarRendererBase"
component="org.richfaces.component.UIPanelBar">
-
+
<h:styles>css/panelbar.xcss</h:styles>
-
- <f:clientid var="clientId" />
+
+ <f:clientid var="clientId" />
<div id="#{clientId}" class="dr-pnlbar rich-panelbar dr-pnlbar-b #{component.attributes['styleClass']}" style="padding: 0px; #{this:height(context, component)} #{this:width(context, component)} #{component.attributes['style']}">
<vcp:body>
<f:call name="renderChildren" />
</vcp:body>
- <f:clientid var="clientId" />
+ <f:clientid var="clientId" />
<input type="hidden" name="#{clientId}" id="#{clientId}_panelBarInput"
- value="#{this:expanded(context, component)}"/>
- <script type="text/javascript">new Exadel.PanelBar("#{clientId}");</script>
+ value="#{this:expanded(context, component)}"/>
+ <script type="text/javascript">new Exadel.PanelBar("#{clientId}", "#{component.attributes['onclick']}");</script>
</div>
</f:root>
17 years, 7 months