Changeset 642

Timestamp:

11/13/07 22:56:41 (1 year ago)

Author:

laurentj

Message:

fixed bug #335: bug in jforms.js with IE, p=tefnout
fixed bug #315: an empty choice in a menulist was not created when the menulist is not required

Files:

• trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
• trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsBuilderBase.class.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (4 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php (modified) (4 diffs)

trunk/lib/jelix-www/js/jforms.js

@@ -51 +51 @@
-
-    verifyForm : function(frmElt){
-getAttribute('id')];
+attributes.getNamedItem("id").value]; // we cannot use getAttribute for id because a bug with IE
-        var msg = '';
-        var valid = true;

trunk/lib/jelix-www/js/jforms.js

@@ -51 +51 @@
-
-    verifyForm : function(frmElt){
-getAttribute('id')];
+attributes.getNamedItem("id").value]; // we cannot use getAttribute for id because a bug with IE
-        var msg = '';
-        var valid = true;

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -244 +244 @@
-                    $value='';
-            }
-
+
+
+
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-                echo '<option value="',htmlspecialchars($v),'"',($v==$value?' selected="selected"':''),'>',htmlspecialchars($label),'</option>';

trunk/lib/jelix/forms/jFormsBuilderBase.class.php

@@ -244 +244 @@
-                    $value='';
-            }
-
+
+
+
-            foreach($ctrl->datasource->getDatas() as $v=>$label){
-                echo '<option value="',htmlspecialchars($v),'"',($v==$value?' selected="selected"':''),'>',htmlspecialchars($label),'</option>';

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php

@@ -309 +309 @@
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
+        $result.='<option value=""></option>';
-        $result.='<option value="10">foo</option>';
-        $result.='<option value="11" selected="selected">bar</option>';
@@ -332 +333 @@
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" readonly="readonly" title="ceci est un tooltip" size="1">';
+        $result.='<option value=""></option>';
-        $result.='<option value="10">foo</option>';
-        $result.='<option value="11" selected="selected">bar</option>';
@@ -338 +340 @@
-        $this->assertEqualOrDiff($result, $out);
-
+        $ctrl->required = true;
-        $this->form->setData('choixsimple',"23");
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
@@ -346 +349 @@
-        $result.='</select>';
-        $this->assertEqualOrDiff($result, $out);
+    
+        $ctrl->required = false;
+        $this->form->setData('choixsimple',"");
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" readonly="readonly" title="ceci est un tooltip" size="1">';
+        $result.='<option value="" selected="selected"></option>';
+        $result.='<option value="10">foo</option>';
+        $result.='<option value="11">bar</option>';
+        $result.='<option value="23">baz</option>';
+        $result.='</select>';
+        $this->assertEqualOrDiff($result, $out);
+        $this->form->setData('choixsimple',"23");
-    }
-

trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html.php

@@ -309 +309 @@
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" size="1">';
+        $result.='<option value=""></option>';
-        $result.='<option value="10">foo</option>';
-        $result.='<option value="11" selected="selected">bar</option>';
@@ -332 +333 @@
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
-        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" readonly="readonly" title="ceci est un tooltip" size="1">';
+        $result.='<option value=""></option>';
-        $result.='<option value="10">foo</option>';
-        $result.='<option value="11" selected="selected">bar</option>';
@@ -338 +340 @@
-        $this->assertEqualOrDiff($result, $out);
-
+        $ctrl->required = true;
-        $this->form->setData('choixsimple',"23");
-        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
@@ -346 +349 @@
-        $result.='</select>';
-        $this->assertEqualOrDiff($result, $out);
+    
+        $ctrl->required = false;
+        $this->form->setData('choixsimple',"");
+        ob_start();$this->builder->outputControl($ctrl);$out = ob_get_clean();
+        $result='<select name="choixsimple" id="'.$this->formname.'_choixsimple" readonly="readonly" title="ceci est un tooltip" size="1">';
+        $result.='<option value="" selected="selected"></option>';
+        $result.='<option value="10">foo</option>';
+        $result.='<option value="11">bar</option>';
+        $result.='<option value="23">baz</option>';
+        $result.='</select>';
+        $this->assertEqualOrDiff($result, $out);
+        $this->form->setData('choixsimple',"23");
-    }
-