JBoss Rich Faces SVN: r10338 - branches/3.2.x/samples/richfaces-demo/src/main/webapp/css.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-07 16:54:57 -0400 (Sun, 07 Sep 2008)
New Revision: 10338
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css
Log:
dr-* panelbar class renamed to rich-*
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css 2008-09-07 20:53:33 UTC (rev 10337)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css 2008-09-07 20:54:57 UTC (rev 10338)
@@ -177,7 +177,7 @@
padding : 0;
}
- .dr-pnlbar-int {
+ .rich-panelbar-interior {
zoom: 1;
}
16 years, 3 months
JBoss Rich Faces SVN: r10337 - trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-07 16:53:33 -0400 (Sun, 07 Sep 2008)
New Revision: 10337
Modified:
trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
Slight tooltip optimization
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-09-07 20:51:42 UTC (rev 10336)
+++ trunk/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-09-07 20:53:33 UTC (rev 10337)
@@ -404,6 +404,23 @@
this.doDisable(e);
},
+ PX_REGEX: /px$/,
+
+ parseToPx: function(value) {
+ if (value) {
+ var v = value.strip();
+ if (this.PX_REGEX.test(v)) {
+ try {
+ return parseInt(v.replace(this.PX_REGEX, ""), 10);
+ } catch (e) {
+
+ }
+ }
+ }
+
+ return NaN;
+ },
+
/*
* we can pass here not event only, but also object {'clientX':XXX, 'clientY':XXX}
*/
@@ -415,15 +432,27 @@
var elementDim = Richfaces.Position.getOffsetDimensions(this.toolTip);
+ var tooltipStyle = this.toolTip.style;
+
// RF-1485, fix for FF
- var _display = this.toolTip.style.display;
- var _visibility = this.toolTip.style.visibility;
- this.toolTip.style.visibility = "hidden";
- this.toolTip.style.display = "block";
+ var _display = tooltipStyle.display;
+ var _visibility = tooltipStyle.visibility;
- this.toolTip.style.top = "0px";
- this.toolTip.style.left = "0px";
+ tooltipStyle.visibility = "hidden";
+ tooltipStyle.display = "block";
+ var oldLeft = this.parseToPx(tooltipStyle.left);
+ if (isNaN(oldLeft)) {
+ oldLeft = 0;
+ tooltipStyle.left = '0px';
+ }
+
+ var oldTop = this.parseToPx(tooltipStyle.top);
+ if (isNaN(oldTop)) {
+ oldTop = 0;
+ tooltipStyle.top = '0px';
+ }
+
var event = jQuery.event.fix(e);
var offsetWidth = this.toolTip.offsetWidth;
@@ -440,10 +469,8 @@
var offsets = jQuery(this.toolTip).offset();
- var event = jQuery.event.fix(e);
-
- var x = coords.x - offsets.left + (event.pageX - event.clientX);
- var y = coords.y - offsets.top + (event.pageY - event.clientY);
+ var x = coords.x - offsets.left + (event.pageX - event.clientX) + oldLeft;
+ var y = coords.y - offsets.top + (event.pageY - event.clientY) + oldTop;
Element.setStyle(this.toolTip, {"left": x + "px", "top": y + "px"});
if(this.iframe)
@@ -455,8 +482,8 @@
this.iframe.style.height = offsetHeight + 'px';
}
- this.toolTip.style.visibility = _visibility;
- this.toolTip.style.display = _display;
+ tooltipStyle.visibility = _visibility;
+ tooltipStyle.display = _display;
this.eventCopy = A4J.AJAX.CloneObject(e, false);
},
16 years, 3 months
JBoss Rich Faces SVN: r10336 - branches/3.2.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-07 16:51:42 -0400 (Sun, 07 Sep 2008)
New Revision: 10336
Modified:
branches/3.2.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
Log:
Slight tooltip optimization
Modified: branches/3.2.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js
===================================================================
--- branches/3.2.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-09-07 20:36:15 UTC (rev 10335)
+++ branches/3.2.x/ui/tooltip/src/main/resources/org/richfaces/renderkit/html/scripts/tooltip.js 2008-09-07 20:51:42 UTC (rev 10336)
@@ -404,6 +404,23 @@
this.doDisable(e);
},
+ PX_REGEX: /px$/,
+
+ parseToPx: function(value) {
+ if (value) {
+ var v = value.strip();
+ if (this.PX_REGEX.test(v)) {
+ try {
+ return parseInt(v.replace(this.PX_REGEX, ""), 10);
+ } catch (e) {
+
+ }
+ }
+ }
+
+ return NaN;
+ },
+
/*
* we can pass here not event only, but also object {'clientX':XXX, 'clientY':XXX}
*/
@@ -415,15 +432,27 @@
var elementDim = Richfaces.Position.getOffsetDimensions(this.toolTip);
+ var tooltipStyle = this.toolTip.style;
+
// RF-1485, fix for FF
- var _display = this.toolTip.style.display;
- var _visibility = this.toolTip.style.visibility;
- this.toolTip.style.visibility = "hidden";
- this.toolTip.style.display = "block";
+ var _display = tooltipStyle.display;
+ var _visibility = tooltipStyle.visibility;
- this.toolTip.style.top = "0px";
- this.toolTip.style.left = "0px";
+ tooltipStyle.visibility = "hidden";
+ tooltipStyle.display = "block";
+ var oldLeft = this.parseToPx(tooltipStyle.left);
+ if (isNaN(oldLeft)) {
+ oldLeft = 0;
+ tooltipStyle.left = '0px';
+ }
+
+ var oldTop = this.parseToPx(tooltipStyle.top);
+ if (isNaN(oldTop)) {
+ oldTop = 0;
+ tooltipStyle.top = '0px';
+ }
+
var event = jQuery.event.fix(e);
var offsetWidth = this.toolTip.offsetWidth;
@@ -440,10 +469,8 @@
var offsets = jQuery(this.toolTip).offset();
- var event = jQuery.event.fix(e);
-
- var x = coords.x - offsets.left + (event.pageX - event.clientX);
- var y = coords.y - offsets.top + (event.pageY - event.clientY);
+ var x = coords.x - offsets.left + (event.pageX - event.clientX) + oldLeft;
+ var y = coords.y - offsets.top + (event.pageY - event.clientY) + oldTop;
Element.setStyle(this.toolTip, {"left": x + "px", "top": y + "px"});
if(this.iframe)
@@ -455,8 +482,8 @@
this.iframe.style.height = offsetHeight + 'px';
}
- this.toolTip.style.visibility = _visibility;
- this.toolTip.style.display = _display;
+ tooltipStyle.visibility = _visibility;
+ tooltipStyle.display = _display;
this.eventCopy = A4J.AJAX.CloneObject(e, false);
},
16 years, 3 months
JBoss Rich Faces SVN: r10335 - in trunk: ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-07 16:36:15 -0400 (Sun, 07 Sep 2008)
New Revision: 10335
Modified:
trunk/samples/richfaces-demo/src/main/webapp/css/common.css
trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
Log:
https://jira.jboss.org/jira/browse/RF-3526
https://jira.jboss.org/jira/browse/RF-4408
Modified: trunk/samples/richfaces-demo/src/main/webapp/css/common.css
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2008-09-07 20:23:38 UTC (rev 10334)
+++ trunk/samples/richfaces-demo/src/main/webapp/css/common.css 2008-09-07 20:36:15 UTC (rev 10335)
@@ -177,7 +177,7 @@
padding : 0;
}
- .dr-pnlbar-ext {
+ .dr-pnlbar-int {
zoom: 1;
}
Modified: trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
===================================================================
--- trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-09-07 20:23:38 UTC (rev 10334)
+++ trunk/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-09-07 20:36:15 UTC (rev 10335)
@@ -98,13 +98,9 @@
var h=0;
this.hclient=0;
for(var i=0; i<this.slides.length; i++) {
- if (Richfaces.browser.isIE6) {
- // https://jira.jboss.org/jira/browse/RF-3526
- var processItem = this.slides[i].item;
- h+= (processItem.offsetHeight -(this.getBorderTB(processItem) + this.getPaddingTB(processItem)));
- } else {
h+=this.slides[i].item.offsetHeight;
- }
+
+
}
this.hclient=h;
this.contentHight = this.panel.clientHeight-h;
@@ -113,18 +109,6 @@
return this.contentHight;
},
- getBorderTB: function(el){
- var top = parseInt(Element.getStyle(el, "border-top-width", 10));
- var bottom = parseInt(Element.getStyle(el, "border-bottom-width", 10));
- return (top + bottom);
- },
-
- getPaddingTB: function(el){
- var top = parseInt(Element.getStyle(el, "padding-top-", 10));
- var bottom = parseInt(Element.getStyle(el, "padding-bottom", 10));
- return (top + bottom);
- },
-
showSlide: function(slide) {
if (this.current) this.current.hideContent();
16 years, 3 months
JBoss Rich Faces SVN: r10334 - branches/3.2.x/samples/richfaces-demo/src/main/webapp/css.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-07 16:23:38 -0400 (Sun, 07 Sep 2008)
New Revision: 10334
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css
Log:
https://jira.jboss.org/jira/browse/RF-3526
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css 2008-09-07 20:23:04 UTC (rev 10333)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/css/common.css 2008-09-07 20:23:38 UTC (rev 10334)
@@ -177,7 +177,7 @@
padding : 0;
}
- .dr-pnlbar-ext {
+ .dr-pnlbar-int {
zoom: 1;
}
16 years, 3 months
JBoss Rich Faces SVN: r10333 - branches/3.2.x/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-07 16:23:04 -0400 (Sun, 07 Sep 2008)
New Revision: 10333
Modified:
branches/3.2.x/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
Log:
https://jira.jboss.org/jira/browse/RF-4408
Modified: branches/3.2.x/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js
===================================================================
--- branches/3.2.x/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-09-05 18:27:38 UTC (rev 10332)
+++ branches/3.2.x/ui/panelbar/src/main/resources/org/richfaces/renderkit/html/scripts/panelbar.js 2008-09-07 20:23:04 UTC (rev 10333)
@@ -7,8 +7,8 @@
initialize: function(panelId, options) {
-// this.FF = (RichFaces.navigatorType() == RichFaces.FF)?true:false;
-// this.isIE = ((navigator.userAgent.toLowerCase().indexOf("msie")!=-1) || (navigator.userAgent.toLowerCase().indexOf("explorer")!=-1))?true:false;
+ this.FF = (RichFaces.navigatorType() == RichFaces.FF)?true:false;
+ this.isIE = ((navigator.userAgent.toLowerCase().indexOf("msie")!=-1) || (navigator.userAgent.toLowerCase().indexOf("explorer")!=-1))?true:false;
this.panel=$(panelId); //+"_p"
if (!this.panel) {
@@ -98,13 +98,9 @@
var h=0;
this.hclient=0;
for(var i=0; i<this.slides.length; i++) {
- if (Richfaces.browser.isIE6) {
- // https://jira.jboss.org/jira/browse/RF-3526
- var processItem = this.slides[i].item;
- h+= (processItem.offsetHeight -(this.getBorderTB(processItem) + this.getPaddingTB(processItem)));
- } else {
h+=this.slides[i].item.offsetHeight;
- }
+
+
}
this.hclient=h;
this.contentHight = this.panel.clientHeight-h;
@@ -113,18 +109,6 @@
return this.contentHight;
},
- getBorderTB: function(el){
- var top = parseInt(Element.getStyle(el, "border-top-width", 10));
- var bottom = parseInt(Element.getStyle(el, "border-bottom-width", 10));
- return (top + bottom);
- },
-
- getPaddingTB: function(el){
- var top = parseInt(Element.getStyle(el, "padding-top-", 10));
- var bottom = parseInt(Element.getStyle(el, "padding-bottom", 10));
- return (top + bottom);
- },
-
showSlide: function(slide) {
if (this.current) this.current.hideContent();
16 years, 3 months
JBoss Rich Faces SVN: r10332 - trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-05 14:27:38 -0400 (Fri, 05 Sep 2008)
New Revision: 10332
Modified:
trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-4413
Modified: trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
===================================================================
--- trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-09-05 18:21:55 UTC (rev 10331)
+++ trunk/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-09-05 18:27:38 UTC (rev 10332)
@@ -114,25 +114,14 @@
private void ensureParentPresent(UIComponent component) {
UIComponent parent = component.getParent();
UIContextMenu menu = (UIContextMenu) component;
- String attachTo = menu.getAttachTo();
- boolean isAttached = false;
- if(null != attachTo && !attachTo.equals("")){
- isAttached = true;
- }
if (parent != null) {
- if (HtmlUtil.shouldWriteId(parent)) {
- return;
- } else
- {
- if(!isAttached){
-
+ if (!HtmlUtil.shouldWriteId(parent) && menu.isAttached()) {
throw new FacesException(
"Context menu cannot be attached to the component with id = "
- + parent.getId()
- + ", because a client identifier of the component won't be rendered onto the page. Please, set the identifier.");
+ + parent.getId()
+ + ", because a client identifier of the component won't be rendered onto the page. Please, set the identifier.");
}
- }
} else {
throw new FacesException(
"Parent component is null for ContextMenu "
16 years, 3 months
JBoss Rich Faces SVN: r10331 - branches/3.2.x/ui/contextMenu/src/main/java/org/richfaces/renderkit/html.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-05 14:21:55 -0400 (Fri, 05 Sep 2008)
New Revision: 10331
Modified:
branches/3.2.x/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
Log:
https://jira.jboss.org/jira/browse/RF-4413
Modified: branches/3.2.x/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java
===================================================================
--- branches/3.2.x/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-09-05 16:27:48 UTC (rev 10330)
+++ branches/3.2.x/ui/contextMenu/src/main/java/org/richfaces/renderkit/html/ContextMenuRendererBase.java 2008-09-05 18:21:55 UTC (rev 10331)
@@ -114,25 +114,14 @@
private void ensureParentPresent(UIComponent component) {
UIComponent parent = component.getParent();
UIContextMenu menu = (UIContextMenu) component;
- String attachTo = menu.getAttachTo();
- boolean isAttached = false;
- if(null != attachTo && !attachTo.equals("")){
- isAttached = true;
- }
if (parent != null) {
- if (HtmlUtil.shouldWriteId(parent)) {
- return;
- } else
- {
- if(!isAttached){
-
+ if (!HtmlUtil.shouldWriteId(parent) && menu.isAttached()) {
throw new FacesException(
"Context menu cannot be attached to the component with id = "
- + parent.getId()
- + ", because a client identifier of the component won't be rendered onto the page. Please, set the identifier.");
+ + parent.getId()
+ + ", because a client identifier of the component won't be rendered onto the page. Please, set the identifier.");
}
- }
} else {
throw new FacesException(
"Parent component is null for ContextMenu "
16 years, 3 months
JBoss Rich Faces SVN: r10330 - in trunk/samples/richfaces-demo/src/main/webapp: richfaces/paint2D/examples and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-05 12:27:48 -0400 (Fri, 05 Sep 2008)
New Revision: 10330
Modified:
trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-3417
Modified: trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-09-05 16:25:45 UTC (rev 10329)
+++ trunk/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-09-05 16:27:48 UTC (rev 10330)
@@ -195,7 +195,7 @@
<managed-property>
<property-name>color</property-name>
<property-class>long</property-class>
- <value>0</value>
+ <value>1000</value>
</managed-property>
<managed-property>
<property-name>scale</property-name>
Modified: trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml
===================================================================
--- trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml 2008-09-05 16:25:45 UTC (rev 10329)
+++ trunk/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml 2008-09-05 16:27:48 UTC (rev 10330)
@@ -23,6 +23,7 @@
showBoundaryValues="false" showToolTip="false"
value="#{paintData.color}" step="255" minValue="0"
maxValue="16000000">
+ <f:convertNumber groupingUsed="false" />
<a4j:support event="onchange" reRender=":painter" />
</rich:inputNumberSlider>
16 years, 3 months
JBoss Rich Faces SVN: r10329 - in branches/3.2.x/samples/richfaces-demo/src/main/webapp: richfaces/paint2D/examples and 1 other directory.
by richfaces-svn-commits@lists.jboss.org
Author: nbelaevski
Date: 2008-09-05 12:25:45 -0400 (Fri, 05 Sep 2008)
New Revision: 10329
Modified:
branches/3.2.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml
Log:
https://jira.jboss.org/jira/browse/RF-3417
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-09-05 16:01:19 UTC (rev 10328)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/WEB-INF/faces-config.xml 2008-09-05 16:25:45 UTC (rev 10329)
@@ -195,7 +195,7 @@
<managed-property>
<property-name>color</property-name>
<property-class>long</property-class>
- <value>0</value>
+ <value>1000</value>
</managed-property>
<managed-property>
<property-name>scale</property-name>
Modified: branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml
===================================================================
--- branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml 2008-09-05 16:01:19 UTC (rev 10328)
+++ branches/3.2.x/samples/richfaces-demo/src/main/webapp/richfaces/paint2D/examples/painter.xhtml 2008-09-05 16:25:45 UTC (rev 10329)
@@ -23,6 +23,7 @@
showBoundaryValues="false" showToolTip="false"
value="#{paintData.color}" step="255" minValue="0"
maxValue="16000000">
+ <f:convertNumber groupingUsed="false" />
<a4j:support event="onchange" reRender=":painter" />
</rich:inputNumberSlider>
16 years, 3 months