Author: mgrigorov
Date: Mon Jan 10 19:34:23 2011
New Revision: 1057328
URL: http://svn.apache.org/viewvc?rev=1057328&view=rev
Log:
WICKET-3319 AjaxEditableMultilineLabel generates invalid HTML
Replace <span> with <div> for AjaxEditableMultilineLabel's MultiLineLabel
merge r1057326 from trunk
Modified:
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.html
Modified:
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html?rev=1057328&r1=1057327&r2=1057328&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html
(original)
+++
wicket/branches/wicket-1.4.x/wicket-examples/src/main/java/org/apache/wicket/examples/ajax/builtin/EditableLabelPage.html
Mon Jan 10 19:34:23 2011
@@ -8,7 +8,7 @@ Click on the area with a green outline t
<br/><br/>
The quick brown <span wicket:id="text1" class="inline-edit">[[editable label
1]]</span> jumped over the lazy <span wicket:id="text2"
class="inline-edit">[[editable label 2]]</span>.
<br/><br/>
-click to edit multiple lines: <span wicket:id="text3">[[multiple lines]]</span>
+click to edit multiple lines: <div wicket:id="text3">[[multiple lines]]</div>
<br/><br/>
click to select another site: <span wicket:id="site">[[site selection]]</span>
Modified:
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.html
URL:
http://svn.apache.org/viewvc/wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.html?rev=1057328&r1=1057327&r2=1057328&view=diff
==============================================================================
---
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.html
(original)
+++
wicket/branches/wicket-1.4.x/wicket-extensions/src/main/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableMultiLineLabel.html
Mon Jan 10 19:34:23 2011
@@ -15,4 +15,4 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
-<wicket:panel><span wicket:id="label">[label]</span><textarea
wicket:id="editor" rows="6" cols="20">[input here]</textarea></wicket:panel>
\ No newline at end of file
+<wicket:panel><div wicket:id="label">[label]</div><textarea wicket:id="editor"
rows="6" cols="20">[input here]</textarea></wicket:panel>
\ No newline at end of file
