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 2012/06/08 12:05:37 UTC
svn commit: r1347999 - in
/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc:
gridLayout/relative-inside-auto-2-columns.xhtml
selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml
Author: lofwyr
Date: Fri Jun 8 10:05:37 2012
New Revision: 1347999
URL: http://svn.apache.org/viewvc?rev=1347999&view=rev
Log:
Merged from trunk
TOBAGO-1151: Define default values for preferredWidth
- fixing the tests:
- changed default
- wrong escaping in JSPX files
[from revision 1347997]
Modified:
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/gridLayout/relative-inside-auto-2-columns.xhtml (contents, props changed)
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml (contents, props changed)
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/gridLayout/relative-inside-auto-2-columns.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/gridLayout/relative-inside-auto-2-columns.xhtml?rev=1347999&r1=1347998&r2=1347999&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/gridLayout/relative-inside-auto-2-columns.xhtml (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/gridLayout/relative-inside-auto-2-columns.xhtml Fri Jun 8 10:05:37 2012
@@ -41,9 +41,9 @@
</tc:panel>
<tc:script file="script/tobago-assert.js"/>
- <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 0, 325, 300);"/>
+ <tc:script onload="TobagoAssert.assertLayout('page:panel', 0, 0, 505, 300);"/>
<tc:script onload="TobagoAssert.assertLayout('page:a1', 0, 0, 300, 300);"/>
- <tc:script onload="TobagoAssert.assertLayout('page:a2', 305, 0, 20, 300);"/>
+ <tc:script onload="TobagoAssert.assertLayout('page:a2', 305, 0, 200, 300);"/>
</tc:page>
</f:view>
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/gridLayout/relative-inside-auto-2-columns.xhtml
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jun 8 10:05:37 2012
@@ -0,0 +1 @@
+/myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/gridLayout/relative-inside-auto-2-columns.xhtml:1347997
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml?rev=1347999&r1=1347998&r2=1347999&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml Fri Jun 8 10:05:37 2012
@@ -36,8 +36,8 @@
<tc:script file="script/tobago-assert.js"/>
- <tc:script onload="TobagoAssert.assertLayout(jQuery('#page\\:s1').parent(), 0, 25, 200, 19);"/>
- <tc:script onload="TobagoAssert.assertLayout(jQuery('#page\\:s2').parent(), 330, 25, 200, 19);"/>
+ <tc:script onload="TobagoAssert.assertLayout(jQuery(Tobago.Utils.escapeClientId('page:s1')).parent(), 0, 25, 200, 19);"/>
+ <tc:script onload="TobagoAssert.assertLayout(jQuery(Tobago.Utils.escapeClientId('page:s2')).parent(), 330, 25, 200, 19);"/>
</tc:page>
</f:view>
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/selectBooleanCheckbox/selectBooleanCheckbox-layout.xhtml:r1347997