[limb-svn] r7121 - in 3.x/trunk/limb/macro: src/tags/form tests/cases/tags/form
svn at limb-project.com
svn at limb-project.com
Wed Jul 16 11:10:27 MSD 2008
Author: serega
Date: 2008-07-16 11:10:27 +0400 (Wed, 16 Jul 2008)
New Revision: 7121
URL: http://fisheye.limb-project.com/changelog/limb/?cs=7121
Modified:
3.x/trunk/limb/macro/src/tags/form/lmbMacroCheckableInputWidget.class.php
3.x/trunk/limb/macro/src/tags/form/lmbMacroSelectWidget.class.php
3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputCheckboxTagTest.class.php
3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputRadioTagTest.class.php
3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroJsCheckboxTagTest.class.php
3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroMultipleSelectTagTest.class.php
3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroSingleSelectTagTest.class.php
Log:
-- now {{input type="checkbox"}}, {{input type="radio"}} and {{select}} MACRO tags now render a valid values for "checked" and "selected" attributes.
Modified: 3.x/trunk/limb/macro/src/tags/form/lmbMacroCheckableInputWidget.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/lmbMacroCheckableInputWidget.class.php 2008-07-15 09:13:56 UTC (rev 7120)
+++ 3.x/trunk/limb/macro/src/tags/form/lmbMacroCheckableInputWidget.class.php 2008-07-16 07:10:27 UTC (rev 7121)
@@ -27,7 +27,7 @@
function renderAttributes()
{
if($this->isChecked())
- $this->setAttribute('checked', 'true');
+ $this->setAttribute('checked', 'checked');
else
$this->removeAttribute('checked');
Modified: 3.x/trunk/limb/macro/src/tags/form/lmbMacroSelectWidget.class.php
===================================================================
--- 3.x/trunk/limb/macro/src/tags/form/lmbMacroSelectWidget.class.php 2008-07-15 09:13:56 UTC (rev 7120)
+++ 3.x/trunk/limb/macro/src/tags/form/lmbMacroSelectWidget.class.php 2008-07-16 07:10:27 UTC (rev 7121)
@@ -63,7 +63,7 @@
echo htmlspecialchars($key, ENT_QUOTES);
echo '"';
if ($selected) {
- echo " selected=\"true\"";
+ echo " selected=\"selected\"";
}
echo '>';
if (empty($option)) {
Modified: 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputCheckboxTagTest.class.php
===================================================================
--- 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputCheckboxTagTest.class.php 2008-07-15 09:13:56 UTC (rev 7120)
+++ 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputCheckboxTagTest.class.php 2008-07-16 07:10:27 UTC (rev 7121)
@@ -18,14 +18,14 @@
$page = $this->_createMacroTemplate($template, 'tpl.html');
$page->set('form_my_form_datasource', array("my_input" => 'foo'));
- $expected = '<form id="my_form"><input type="checkbox" name="my_input" value="foo" checked="true" /></form>';
+ $expected = '<form id="my_form"><input type="checkbox" name="my_input" value="foo" checked="checked" /></form>';
$this->assertEqual($page->render(), $expected);
}
function testRemoveCheckedIfNotChecked()
{
$template = '{{form id="my_form"}}'.
- '{{input type="checkbox" name="my_input" value="bar" checked="true"}}' .
+ '{{input type="checkbox" name="my_input" value="bar" checked="checked"}}' .
'{{/form}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
$page->set('form_my_form_datasource', array("my_input" => 'foo'));
@@ -42,13 +42,13 @@
$page->set('bar', '1');
- $expected = '<input type="checkbox" id="test" name="my_input" checked="true" />';
+ $expected = '<input type="checkbox" id="test" name="my_input" checked="checked" />';
$this->assertEqual($page->render(), $expected);
}
function testNotChecked_With_CheckedValueAttribute_And_ValueAttribute()
{
- $template = '{{input type="checkbox" id="test" name="my_input" value="1" checked_value="{$#bar}" checked="true" /}}';
+ $template = '{{input type="checkbox" id="test" name="my_input" value="1" checked_value="{$#bar}" checked="checked" /}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
Modified: 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputRadioTagTest.class.php
===================================================================
--- 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputRadioTagTest.class.php 2008-07-15 09:13:56 UTC (rev 7120)
+++ 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroInputRadioTagTest.class.php 2008-07-16 07:10:27 UTC (rev 7121)
@@ -14,14 +14,14 @@
{
$template = '{{form id="my_form"}}'.
'{{input type="radio" id="r1" name="my_input" value="foo"/}}'.
- '{{input type="radio" id="r2" name="my_input" value="bar" checked="true" /}}'.
+ '{{input type="radio" id="r2" name="my_input" value="bar" checked="checked" /}}'.
'{{/form}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
$page->set('form_my_form_datasource', array("my_input" => 'foo'));
$expected = '<form id="my_form">'.
- '<input type="radio" id="r1" name="my_input" value="foo" checked="true" />'.
+ '<input type="radio" id="r1" name="my_input" value="foo" checked="checked" />'.
'<input type="radio" id="r2" name="my_input" value="bar" />'.
'</form>';
$this->assertEqual($page->render(), $expected);
@@ -31,14 +31,14 @@
{
$template = '{{form id="my_form"}}'.
'{{input type="radio" id="r0" name="my_input" value="0"/}}'.
- '{{input type="radio" id="r1" name="my_input" value="1" checked="true" /}}'.
+ '{{input type="radio" id="r1" name="my_input" value="1" checked="checked" /}}'.
'{{input type="radio" id="r2" name="my_input" value="2"/}}'.
'{{/form}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
$expected = '<form id="my_form">'.
'<input type="radio" id="r0" name="my_input" value="0" />'.
- '<input type="radio" id="r1" name="my_input" value="1" checked="true" />'.
+ '<input type="radio" id="r1" name="my_input" value="1" checked="checked" />'.
'<input type="radio" id="r2" name="my_input" value="2" />'.
'</form>';
Modified: 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroJsCheckboxTagTest.class.php
===================================================================
--- 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroJsCheckboxTagTest.class.php 2008-07-15 09:13:56 UTC (rev 7120)
+++ 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroJsCheckboxTagTest.class.php 2008-07-16 07:10:27 UTC (rev 7121)
@@ -23,24 +23,24 @@
function testRenderHiddenWithCheckedCheckbox()
{
- $template = '{{js_checkbox name="my_checkbox" value="$#var" checked="true"/}}';
+ $template = '{{js_checkbox name="my_checkbox" value="$#var" checked="checked"/}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
$page->set('var', 1);
- $expected = '<input checked="true" type="checkbox" value="1" onchange="this.form.elements[\'_my_checkbox\'].value = 1*this.checked" />'.
+ $expected = '<input checked="checked" type="checkbox" value="1" onchange="this.form.elements[\'_my_checkbox\'].value = 1*this.checked" />'.
'<input type="hidden" id="_my_checkbox" name="my_checkbox" value="1" />';
$this->assertEqual($page->render(), $expected);
}
function testChecked_With_CheckedValueAttribute()
{
- $template = '{{js_checkbox name="my_checkbox" checked_value="$#var" checked="true"/}}';
+ $template = '{{js_checkbox name="my_checkbox" checked_value="$#var" checked="checked"/}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
$page->set('var', 1);
- $expected = '<input checked="true" type="checkbox" onchange="this.form.elements[\'_my_checkbox\'].value = 1*this.checked" />'.
+ $expected = '<input checked="checked" type="checkbox" onchange="this.form.elements[\'_my_checkbox\'].value = 1*this.checked" />'.
'<input type="hidden" id="_my_checkbox" name="my_checkbox" value="1" />';
$this->assertEqual($page->render(), $expected);
@@ -48,7 +48,7 @@
function testNotChecked_With_CheckedValueAttribute_And_ValueAttribute()
{
- $template = '{{js_checkbox name="my_checkbox" checked_value="$#var" value="1" checked="true"/}}';
+ $template = '{{js_checkbox name="my_checkbox" checked_value="$#var" value="1" checked="checked"/}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
$page->set('var', 2);
Modified: 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroMultipleSelectTagTest.class.php
===================================================================
--- 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroMultipleSelectTagTest.class.php 2008-07-15 09:13:56 UTC (rev 7120)
+++ 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroMultipleSelectTagTest.class.php 2008-07-16 07:10:27 UTC (rev 7121)
@@ -29,7 +29,7 @@
$page->set('selected_value', array('00ff00', '0000ff'));
$expected = '<select id="my_select" name="my_select[]" multiple="true">'.
- '<option value="ff0000">red</option><option value="00ff00" selected="true">green</option><option value="0000ff" selected="true">blue</option>'.
+ '<option value="ff0000">red</option><option value="00ff00" selected="selected">green</option><option value="0000ff" selected="selected">blue</option>'.
'</select>';
$this->assertEqual($page->render(), $expected);
}
@@ -44,7 +44,7 @@
array('my_color' => '0000ff', 'id' => 'whatever'))));
$expected = '<select id="my_select" name="my_select[]" multiple="true">'.
- '<option value="ff0000">red</option><option value="00ff00" selected="true">green</option><option value="0000ff" selected="true">blue</option>'.
+ '<option value="ff0000">red</option><option value="00ff00" selected="selected">green</option><option value="0000ff" selected="selected">blue</option>'.
'</select>';
$this->assertEqual($page->render(), $expected);
}
@@ -59,7 +59,7 @@
$expected = '<form name="my_form">'.
'<select id="my_select" name="my_select[]" multiple="true">'.
- '<option value="ff0000">red</option><option value="00ff00" selected="true">green</option><option value="0000ff" selected="true">blue</option>'.
+ '<option value="ff0000">red</option><option value="00ff00" selected="selected">green</option><option value="0000ff" selected="selected">blue</option>'.
'</select>'.
'</form>';
$this->assertEqual($page->render(), $expected);
Modified: 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroSingleSelectTagTest.class.php
===================================================================
--- 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroSingleSelectTagTest.class.php 2008-07-15 09:13:56 UTC (rev 7120)
+++ 3.x/trunk/limb/macro/tests/cases/tags/form/lmbMacroSingleSelectTagTest.class.php 2008-07-16 07:10:27 UTC (rev 7121)
@@ -28,7 +28,7 @@
$page->set('options', array('ff0000' => 'red', '00ff00' => 'green'));
$page->set('selected_value', '00ff00');
- $expected = '<select name="my_select"><option value="ff0000">red</option><option value="00ff00" selected="true">green</option></select>';
+ $expected = '<select name="my_select"><option value="ff0000">red</option><option value="00ff00" selected="selected">green</option></select>';
$this->assertEqual($page->render(), $expected);
}
@@ -40,7 +40,7 @@
$page->set('options', array('>>' => '<<', '"' => '""'));
$page->set('selected_value', '"');
- $expected = '<select name="my_select"><option value=">>"><<</option><option value=""" selected="true">""</option></select>';
+ $expected = '<select name="my_select"><option value=">>"><<</option><option value=""" selected="selected">""</option></select>';
$this->assertEqual($page->render(), $expected);
}
@@ -52,7 +52,7 @@
$page->set('options', array('ff0000' => 'red', '00ff00' => 'green'));
$page->set('selected_value_object', new lmbObject(array('my_color' => '00ff00', 'id' => 'ff0000')));
- $expected = '<select name="my_select"><option value="ff0000">red</option><option value="00ff00" selected="true">green</option></select>';
+ $expected = '<select name="my_select"><option value="ff0000">red</option><option value="00ff00" selected="selected">green</option></select>';
$this->assertEqual($page->render(), $expected);
}
@@ -66,7 +66,7 @@
$expected = '<form name="my_form">'.
'<select name="my_select">'.
- '<option value="ff0000">red</option><option value="00ff00" selected="true">green</option>'.
+ '<option value="ff0000">red</option><option value="00ff00" selected="selected">green</option>'.
'</select>'.
'</form>';
$this->assertEqual($page->render(), $expected);
@@ -76,13 +76,13 @@
{
$template = '{{select name="my_select"}}'.
'{{option value="1"}}test1{{/option}}'.
- '{{option value="2" selected="true"}}test2{{/option}}'.
+ '{{option value="2" selected="selected"}}test2{{/option}}'.
'{{/select}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
$expected = '<select name="my_select">'.
'<option value="1">test1</option>'.
- '<option value="2" selected="true">test2</option>'.
+ '<option value="2" selected="selected">test2</option>'.
'</select>';
$this->assertEqual($page->render(), $expected);
}
@@ -91,7 +91,7 @@
{
$template = '{{select name="my_select" options="$#options"}}'.
'{{option value="1" prepend="true"}}test1{{/option}}'.
- '{{option value="4" selected="true"}}test4{{/option}}'.
+ '{{option value="4" selected="selected"}}test4{{/option}}'.
'{{/select}}';
$page = $this->_createMacroTemplate($template, 'tpl.html');
@@ -102,7 +102,7 @@
'<option value="1">test1</option>'.
'<option value="2">test2</option>'.
'<option value="3">test3</option>'.
- '<option value="4" selected="true">test4</option>'.
+ '<option value="4" selected="selected">test4</option>'.
'</select>';
$this->assertEqual($page->render(), $expected);
More information about the limb-svn
mailing list