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 2016/11/25 07:31:22 UTC
svn commit: r1771248 - in /myfaces/tobago/trunk:
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/
tobago-theme/tobago-theme-standard/src/main/resour...
Author: lofwyr
Date: Fri Nov 25 07:31:21 2016
New Revision: 1771248
URL: http://svn.apache.org/viewvc?rev=1771248&view=rev
Log:
TOBAGO-1617
New tag <tc:event> to be similar to <f:ajax> and to replace <tc:command>
in facets
* clientId will now be rendered with labelLayout=skip for: tc:file,
tc:selectManyShuttle and tc:in with facets
* doublicated clientId fixed for tc:selectBooleanCheckbox
* 'action' is now used as the default for an ajax request
[developed by hnoeth]
Modified:
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIFile.java Fri Nov 25 07:31:21 2016
@@ -73,4 +73,8 @@ public abstract class AbstractUIFile ext
return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "real";
}
}
+
+ public boolean isLabelLayoutSkip() {
+ return getLabelLayout() == LabelLayout.skip;
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUIInput.java Fri Nov 25 07:31:21 2016
@@ -19,6 +19,7 @@
package org.apache.myfaces.tobago.internal.component;
+import org.apache.myfaces.tobago.component.Facets;
import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.component.SupportsAccessKey;
@@ -26,6 +27,7 @@ import org.apache.myfaces.tobago.compone
import org.apache.myfaces.tobago.component.Visual;
import org.apache.myfaces.tobago.util.ComponentUtils;
+import javax.faces.component.UIComponent;
import javax.faces.component.behavior.ClientBehaviorHolder;
import javax.faces.context.FacesContext;
@@ -44,10 +46,17 @@ public abstract class AbstractUIInput ex
@Override
public String getFieldId(final FacesContext facesContext) {
- if (getLabelLayout() == LabelLayout.skip) {
+ final UIComponent before = getFacet(Facets.before.name());
+ final UIComponent after = getFacet(Facets.after.name());
+
+ if (getLabelLayout() == LabelLayout.skip && before == null && after==null) {
return getClientId(facesContext);
} else {
return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
}
}
+
+ public boolean isLabelLayoutSkip() {
+ return getLabelLayout() == LabelLayout.skip;
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectBooleanCheckbox.java Fri Nov 25 07:31:21 2016
@@ -19,7 +19,6 @@
package org.apache.myfaces.tobago.internal.component;
-import org.apache.myfaces.tobago.component.LabelLayout;
import org.apache.myfaces.tobago.component.SupportFieldId;
import org.apache.myfaces.tobago.component.SupportsAccessKey;
import org.apache.myfaces.tobago.component.SupportsLabelLayout;
@@ -79,10 +78,6 @@ public abstract class AbstractUISelectBo
@Override
public String getFieldId(final FacesContext facesContext) {
- if (getLabelLayout() == LabelLayout.skip) {
- return getClientId(facesContext);
- } else {
- return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
- }
+ return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "field";
}
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUISelectManyShuttle.java Fri Nov 25 07:31:21 2016
@@ -43,4 +43,8 @@ public abstract class AbstractUISelectMa
return getClientId(facesContext) + ComponentUtils.SUB_SEPARATOR + "unselected";
}
}
+
+ public boolean isLabelLayoutSkip() {
+ return getLabelLayout() == LabelLayout.skip;
+ }
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/FileRenderer.java Fri Nov 25 07:31:21 2016
@@ -122,6 +122,9 @@ public class FileRenderer extends LabelL
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(Classes.create(file), file.getCustomClass());
+ if (file.isLabelLayoutSkip()) {
+ writer.writeIdAttribute(clientId);
+ }
HtmlRendererUtils.writeDataAttributes(facesContext, writer, file);
writer.writeStyleAttribute(file.getStyle());
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java Fri Nov 25 07:31:21 2016
@@ -75,6 +75,9 @@ public class InRenderer extends LabelLay
if (after != null || before != null) {
writer.startElement(HtmlElements.DIV); // Wrapping the field to fix input groups with flexLeft/flexRight
+ if (input.isLabelLayoutSkip()) {
+ writer.writeIdAttribute(clientId);
+ }
writer.startElement(HtmlElements.DIV);
writer.writeClassAttribute(BootstrapClass.INPUT_GROUP);
}
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/SelectManyShuttleRenderer.java Fri Nov 25 07:31:21 2016
@@ -44,10 +44,13 @@ public class SelectManyShuttleRenderer e
@Override
public void encodeBeginField(final FacesContext facesContext, final UIComponent component) throws IOException {
final UISelectManyShuttle select = (UISelectManyShuttle) component;
+ final String clientId = select.getClientId(facesContext);
final TobagoResponseWriter writer = getResponseWriter(facesContext);
writer.startElement(HtmlElements.DIV);
+ if(select.isLabelLayoutSkip()) {
+ writer.writeIdAttribute(clientId);
+ }
writer.writeClassAttribute(Classes.create(select), select.getCustomClass());
- final String clientId = select.getClientId(facesContext);
HtmlRendererUtils.writeDataAttributes(facesContext, writer, select);
final String title = HtmlRendererUtils.getTitleFromTipAndMessages(facesContext, select);
if (title != null) {
Modified: myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js?rev=1771248&r1=1771247&r2=1771248&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js (original)
+++ myfaces/tobago/trunk/tobago-theme/tobago-theme-standard/src/main/resources/META-INF/resources/org/apache/myfaces/tobago/renderkit/html/standard/standard/script/tobago.js Fri Nov 25 07:31:21 2016
@@ -433,7 +433,7 @@ var Tobago = {
if (command.execute || command.render) {
Tobago.preparePartialOverlay(command);
jsf.ajax.request(
- jQuery(this).attr("id"),
+ action,
event,
{
"javax.faces.behavior.event": event.type,