You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2014/11/20 00:01:42 UTC
svn commit: r1640638 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/util/
tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfac...
Author: lofwyr
Date: Wed Nov 19 23:01:41 2014
New Revision: 1640638
URL: http://svn.apache.org/r1640638
Log:
TOBAGO-1422: datepicker trigger icon not correctly shown inside sheet
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java?rev=1640638&r1=1640637&r2=1640638&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIGridLayout.java Wed Nov 19 23:01:41 2014
@@ -31,7 +31,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.layout.OriginCell;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.AutoLayoutToken;
-import org.apache.myfaces.tobago.layout.Display;
import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.LayoutContainer;
import org.apache.myfaces.tobago.layout.LayoutManager;
@@ -311,8 +310,6 @@ public abstract class AbstractUIGridLayo
if (cell instanceof OriginCell) {
final LayoutComponent component = cell.getComponent();
- component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and tobago.css
-
final Integer span = ((OriginCell) cell).getSpan(orientation);
// compute the size of the cell
@@ -364,8 +361,6 @@ public abstract class AbstractUIGridLayo
if (cell instanceof OriginCell) {
final LayoutComponent component = cell.getComponent();
- component.setDisplay(Display.BLOCK);
-
// compute the position of the cell
Measure position = Measure.ZERO;
position = position.add(LayoutUtils.getPaddingBegin(orientation, getLayoutContainer()));
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java?rev=1640638&r1=1640637&r2=1640638&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISheetLayout.java Wed Nov 19 23:01:41 2014
@@ -26,7 +26,6 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.layout.OriginCell;
import org.apache.myfaces.tobago.internal.util.StringUtils;
import org.apache.myfaces.tobago.layout.AutoLayoutToken;
-import org.apache.myfaces.tobago.layout.Display;
import org.apache.myfaces.tobago.layout.LayoutBox;
import org.apache.myfaces.tobago.layout.LayoutComponent;
import org.apache.myfaces.tobago.layout.LayoutContainer;
@@ -157,7 +156,6 @@ public abstract class AbstractUISheetLay
final LayoutComponentRenderer renderer = sheet.getLayoutComponentRenderer(facesContext);
width = width.subtractNotNegative(renderer.getCustomMeasure(facesContext, sheet, "columnSeparator"));
LayoutUtils.setCurrentSize(orientation, component, width);
- component.setDisplay(Display.BLOCK); // TODO: use CSS via classes and tobago.css
// call sub layout manager
if (component instanceof LayoutContainer) {
((LayoutContainer) component).getLayoutManager().mainProcessing(orientation);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java?rev=1640638&r1=1640637&r2=1640638&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/util/CreateComponentUtils.java Wed Nov 19 23:01:41 2014
@@ -74,6 +74,7 @@ public final class CreateComponentUtils
return createTextColumn(label, sortable, align, value, null);
}
+ @Deprecated
public static AbstractUIColumn createTextColumn(
final String label, final String sortable, final String align, final String value, final String clientId) {
final AbstractUIOut text = (AbstractUIOut) createComponent(ComponentTypes.OUT, RendererTypes.OUT, clientId + "_t");
@@ -90,6 +91,7 @@ public final class CreateComponentUtils
return createColumn(label, sortable, align, child, null);
}
+ @Deprecated
public static AbstractUIColumn createColumn(
final String label, final String sortable, final String align, final UIComponent child, final String clientId) {
final AbstractUIColumn column = createColumn(label, sortable, align, clientId);
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css?rev=1640638&r1=1640637&r2=1640638&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-scarborough/src/main/resources/org/apache/myfaces/tobago/renderkit/html/scarborough/standard/style/tobago.css Wed Nov 19 23:01:41 2014
@@ -263,6 +263,10 @@ span.tobago-calendar-header {
vertical-align: bottom;
}
+.ui-datepicker-trigger {
+ margin-left: 5px;
+}
+
/* file -------------------------------------------------------------------- */
.tobago-file {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js?rev=1640638&r1=1640637&r2=1640638&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago-calendar.js Wed Nov 19 23:01:41 2014
@@ -566,7 +566,7 @@ Tobago.DateTime.init = function (element
var buttonImage = date.next("img");
buttonImage.css({
position: "absolute",
- left: parseInt(date.css("left")) + date.outerWidth(true) + 5 + "px",
+ left: parseInt(date.css("left")) + date.outerWidth(true),
top: date.css("top")
});
});