Changeset 458
- Timestamp:
- 06/15/07 17:36:16 (1 year ago)
- Files:
-
- branches/experimental/jforms/lib/jelix/forms/jFormsControl.class.php (modified) (6 diffs)
- branches/experimental/jforms/lib/jelix/forms/jFormsControl.class.php (modified) (6 diffs)
- branches/experimental/jforms/testapp/modules/unittest/classes/utjforms.class.php (modified) (6 diffs)
- branches/experimental/jforms/testapp/modules/unittest/classes/utjforms.class.php (modified) (6 diffs)
Legend:
- Unmodified
- Added
- Removed
- Modified
- Copied
- Moved
branches/experimental/jforms/lib/jelix/forms/jFormsControl.class.php
r453 r458 49 49 * @experimental 50 50 */ 51 class jFormsControlSelect1 extends jFormsControl {51 abstract class jFormsBaseControlSelect1 extends jFormsControl { 52 52 public $type="select1"; 53 53 /** … … 63 63 * @experimental 64 64 */ 65 /*class jFormsControlSelect extends jForms ControlSelect1 {65 /*class jFormsControlSelect extends jFormsBaseControlSelect1 { 66 66 public $type="select"; 67 67 }*/ … … 73 73 * @experimental 74 74 */ 75 class jFormsControlCheckboxes extends jForms ControlSelect1 {75 class jFormsControlCheckboxes extends jFormsBaseControlSelect1 { 76 76 public $type="checkboxes"; 77 77 } … … 83 83 * @experimental 84 84 */ 85 class jFormsControlRadiobuttons extends jForms ControlSelect1 {85 class jFormsControlRadiobuttons extends jFormsBaseControlSelect1 { 86 86 public $type="radiobuttons"; 87 87 } … … 93 93 * @experimental 94 94 */ 95 class jFormsControlListbox extends jForms ControlSelect1 {95 class jFormsControlListbox extends jFormsBaseControlSelect1 { 96 96 public $type="listbox"; 97 97 public $multiple = false; … … 104 104 * @experimental 105 105 */ 106 class jFormsControlMenulist extends jForms ControlSelect1 {106 class jFormsControlMenulist extends jFormsBaseControlSelect1 { 107 107 public $type="menulist"; 108 108 } branches/experimental/jforms/lib/jelix/forms/jFormsControl.class.php
r453 r458 49 49 * @experimental 50 50 */ 51 class jFormsControlSelect1 extends jFormsControl {51 abstract class jFormsBaseControlSelect1 extends jFormsControl { 52 52 public $type="select1"; 53 53 /** … … 63 63 * @experimental 64 64 */ 65 /*class jFormsControlSelect extends jForms ControlSelect1 {65 /*class jFormsControlSelect extends jFormsBaseControlSelect1 { 66 66 public $type="select"; 67 67 }*/ … … 73 73 * @experimental 74 74 */ 75 class jFormsControlCheckboxes extends jForms ControlSelect1 {75 class jFormsControlCheckboxes extends jFormsBaseControlSelect1 { 76 76 public $type="checkboxes"; 77 77 } … … 83 83 * @experimental 84 84 */ 85 class jFormsControlRadiobuttons extends jForms ControlSelect1 {85 class jFormsControlRadiobuttons extends jFormsBaseControlSelect1 { 86 86 public $type="radiobuttons"; 87 87 } … … 93 93 * @experimental 94 94 */ 95 class jFormsControlListbox extends jForms ControlSelect1 {95 class jFormsControlListbox extends jFormsBaseControlSelect1 { 96 96 public $type="listbox"; 97 97 public $multiple = false; … … 104 104 * @experimental 105 105 */ 106 class jFormsControlMenulist extends jForms ControlSelect1 {106 class jFormsControlMenulist extends jFormsBaseControlSelect1 { 107 107 public $type="menulist"; 108 108 } branches/experimental/jforms/testapp/modules/unittest/classes/utjforms.class.php
r453 r458 54 54 <label>Votre nom</label> 55 55 </upload>', 56 8=>'<select1 ref="nom" xmlns="http://jelix.org/ns/forms/1.0"56 /*8=>'<select1 ref="nom" xmlns="http://jelix.org/ns/forms/1.0" 57 57 dao="foo" daomethod="bar" daolabelproperty="baz" daovalueproperty="plop"> 58 58 <label>Votre nom</label> … … 63 63 <item labellocale="locb" value="bbb" /> 64 64 <item value="ccc"/> 65 </select>', 65 </select>',*/ 66 66 10=>'<submit ref="nom" xmlns="http://jelix.org/ns/forms/1.0"> 67 67 <label>Votre nom</label> … … 202 202 $ctrl->label=\'Votre nom\'; 203 203 $this->addControl($ctrl);', 204 8=>'$ctrl= new jFormsControlselect1(\'nom\');204 /*8=>'$ctrl= new jFormsControlselect1(\'nom\'); 205 205 $ctrl->datatype= new jDatatypeString(); 206 206 $ctrl->label=\'Votre nom\'; … … 216 216 \'ccc\'=>\'ccc\', 217 217 ); 218 $this->addControl($ctrl);', 218 $this->addControl($ctrl);',*/ 219 219 10=>'$ctrl= new jFormsControlsubmit(\'nom\'); 220 220 $ctrl->datatype= new jDatatypeString(); … … 407 407 $js.="gControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n"; 408 408 $js.="gForm.addControl( gControl);\n";', 409 8=>'$label = str_replace("\'","\\\'",\'Votre nom\');409 /*8=>'$label = str_replace("\'","\\\'",\'Votre nom\'); 410 410 $js.="gControl = new jFormsControl(\'nom\', \'".$label."\', \'string\');\n"; 411 411 $js.="gControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n"; … … 416 416 $js.="gControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n"; 417 417 $js.="gControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n"; 418 $js.="gForm.addControl( gControl);\n";', 418 $js.="gForm.addControl( gControl);\n";',*/ 419 419 10=>'$label = str_replace("\'","\\\'",\'Votre nom\'); 420 420 $js.="gControl = new jFormsControl(\'nom\', \'".$label."\', \'string\');\n"; branches/experimental/jforms/testapp/modules/unittest/classes/utjforms.class.php
r453 r458 54 54 <label>Votre nom</label> 55 55 </upload>', 56 8=>'<select1 ref="nom" xmlns="http://jelix.org/ns/forms/1.0"56 /*8=>'<select1 ref="nom" xmlns="http://jelix.org/ns/forms/1.0" 57 57 dao="foo" daomethod="bar" daolabelproperty="baz" daovalueproperty="plop"> 58 58 <label>Votre nom</label> … … 63 63 <item labellocale="locb" value="bbb" /> 64 64 <item value="ccc"/> 65 </select>', 65 </select>',*/ 66 66 10=>'<submit ref="nom" xmlns="http://jelix.org/ns/forms/1.0"> 67 67 <label>Votre nom</label> … … 202 202 $ctrl->label=\'Votre nom\'; 203 203 $this->addControl($ctrl);', 204 8=>'$ctrl= new jFormsControlselect1(\'nom\');204 /*8=>'$ctrl= new jFormsControlselect1(\'nom\'); 205 205 $ctrl->datatype= new jDatatypeString(); 206 206 $ctrl->label=\'Votre nom\'; … … 216 216 \'ccc\'=>\'ccc\', 217 217 ); 218 $this->addControl($ctrl);', 218 $this->addControl($ctrl);',*/ 219 219 10=>'$ctrl= new jFormsControlsubmit(\'nom\'); 220 220 $ctrl->datatype= new jDatatypeString(); … … 407 407 $js.="gControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n"; 408 408 $js.="gForm.addControl( gControl);\n";', 409 8=>'$label = str_replace("\'","\\\'",\'Votre nom\');409 /*8=>'$label = str_replace("\'","\\\'",\'Votre nom\'); 410 410 $js.="gControl = new jFormsControl(\'nom\', \'".$label."\', \'string\');\n"; 411 411 $js.="gControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n"; … … 416 416 $js.="gControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n"; 417 417 $js.="gControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n"; 418 $js.="gForm.addControl( gControl);\n";', 418 $js.="gForm.addControl( gControl);\n";',*/ 419 419 10=>'$label = str_replace("\'","\\\'",\'Votre nom\'); 420 420 $js.="gControl = new jFormsControl(\'nom\', \'".$label."\', \'string\');\n";
