svn commit: r1770167 - in /myfaces/tobago/trunk: tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js

[lo...@apache.org]

Author: lofwyr
Date: Thu Nov 17 11:29:20 2016
New Revision: 1770167

URL: http://svn.apache.org/viewvc?rev=1770167&view=rev
Log:
TOBAGO-1612 Layout is broken for an input group with a label
* fix layout with an additional DIV
[developed by hnoeth]

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/renderkit/renderer/InRenderer.java
    myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js

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=1770167&r1=1770166&r2=1770167&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 Thu Nov 17 11:29:20 2016
@@ -24,15 +24,15 @@ import org.apache.myfaces.tobago.compone
 import org.apache.myfaces.tobago.internal.component.AbstractUIButton;
 import org.apache.myfaces.tobago.internal.component.AbstractUIInput;
 import org.apache.myfaces.tobago.internal.util.AccessKeyLogger;
+import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
+import org.apache.myfaces.tobago.internal.util.JsonUtils;
+import org.apache.myfaces.tobago.internal.util.RenderUtils;
 import org.apache.myfaces.tobago.internal.util.StringUtils;
 import org.apache.myfaces.tobago.renderkit.css.BootstrapClass;
 import org.apache.myfaces.tobago.renderkit.css.Classes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlAttributes;
 import org.apache.myfaces.tobago.renderkit.html.HtmlElements;
 import org.apache.myfaces.tobago.renderkit.html.HtmlInputTypes;
-import org.apache.myfaces.tobago.internal.util.JsonUtils;
-import org.apache.myfaces.tobago.internal.util.HtmlRendererUtils;
-import org.apache.myfaces.tobago.internal.util.RenderUtils;
 import org.apache.myfaces.tobago.util.ComponentUtils;
 import org.apache.myfaces.tobago.webapp.TobagoResponseWriter;
 import org.slf4j.Logger;
@@ -74,6 +74,7 @@ public class InRenderer extends LabelLay
     final UIComponent before = ComponentUtils.getFacet(input, Facets.before);
 
     if (after != null || before != null) {
+      writer.startElement(HtmlElements.DIV); // Wrapping the field to fix input groups with flexLeft/flexRight
       writer.startElement(HtmlElements.DIV);
       writer.writeClassAttribute(BootstrapClass.INPUT_GROUP);
     }
@@ -137,6 +138,7 @@ public class InRenderer extends LabelLay
 
     if (after != null || before != null) {
       writer.endElement(HtmlElements.DIV);
+      writer.endElement(HtmlElements.DIV);
     }
   }
 

Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js?rev=1770167&r1=1770166&r2=1770167&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/webapp/content/20-component/010-input/10-in/in.test.js Thu Nov 17 11:29:20 2016
@@ -31,7 +31,7 @@ QUnit.test("ajax change event", function
   var done = assert.async();
 
   var $inputField = jQueryFrame("#page\\:mainForm\\:inputAjax\\:\\:field");
-  var $outputField = jQueryFrame("#page\\:mainForm\\:outputAjax > span:first");
+  var $outputField = jQueryFrame("#page\\:mainForm\\:outputAjax span:first");
 
   assert.equal($inputField.val(), "");
   assert.equal($outputField.text(), "");