Changeset 1069 for trunk/lib

Timestamp:

08/27/08 23:57:27 (3 months ago)

Author:

laurentj

Message:

jforms: fixed bug on javascript validation, and reduced generated js code size

Files:

• trunk/lib/jelix-www/js/jforms.js (modified) (4 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (14 diffs)

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

@@ -17 +17 @@
-
-// declare a form control
-jForms.tControl
-jForms.tControl
-jForms.tControl
-jForms.tControl
- gControl
+var c
+c
+c
+c
+c
-...
-
-
+. A 'submit" event handler will be attached to the corresponding form element
-jForms.declareForm(jForms.tForm);
-
-//On a form tag, you should add this onsubmit attribute :
-onsubmit="return jForms.verifyForm(this)"
-
-*/
@@ -39 +36 @@
-
-    tForm: null,
-    tControl: null,
-    tControl2: null,
-    frmElt: null,
-
@@ -611 +606 @@
-
-        var list = this.items[val];
+        var valid = true;
-        for(var i=0; i < list.length; i++) {
-            var val2 = jfrm.getValue(jfrm.frmElt.elements[list[i].name]);
@@ -617 +613 @@
-                if (list[i].required) {
-                    jfrm.tForm.errorDecorator.addError(list[i], 1);
+                    valid = false;
-                }
-            } else if (!list[i].check(val2, jfrm)) {
-                jfrm.tForm.errorDecorator.addError(list[i], 2);
-
-
-
+
+
+
+
-    },
-    activate : function (val) {

trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -158 +158 @@
-        echo '<script type="text/javascript">
-//<![CDATA[
+(function(){var c, c2;
-'.$this->jsContent.'
+})();
-//]]>
-</script>';
@@ -192 +194 @@
-    }
-
+    protected function escJsStr($str) {
+        return '\''.str_replace(array("'","\n"),array("\\'", "\\n"), $str).'\'';
+    }
+
-    protected function commonJs($ctrl) {
-        if($ctrl->help){
-jForms.tControl.help='".str_replace("'","\\'",$ctrl->help)."'
+c.help=".$this->escJsStr($ctrl->help)."
-        }
-
-        if($ctrl->required){
-jForms.tControl
+c
-            if($ctrl->alertRequired){
-jForms.tControl.errRequired='".str_replace("'","\\'",$ctrl->alertRequired)."'
+c.errRequired=".$this->escJsStr($ctrl->alertRequired)."
-            }
-            else {
-jForms.tControl.errRequired='".str_replace("'","\\'",jLocale::get('jelix~formserr.js.err.required', $ctrl->label))."'
+c.errRequired=".$this->escJsStr(jLocale::get('jelix~formserr.js.err.required', $ctrl->label))."
-            }
-        }
-
-        if($ctrl->alertInvalid){
-jForms.tControl.errInvalid='".str_replace("'","\\'",$ctrl->alertInvalid)."'
+c.errInvalid=".$this->escJsStr($ctrl->alertInvalid)."
-        }
-        else {
-jForms.tControl.errInvalid='".str_replace("'","\\'",jLocale::get('jelix~formserr.js.err.invalid', $ctrl->label))."'
-
-
-jForms.tControl
+c.errInvalid=".$this->escJsStr(jLocale::get('jelix~formserr.js.err.invalid', $ctrl->label))."
+
+
+c
-    }
-
@@ -245 +251 @@
-            $dt = 'String';
-
-jForms.tControl = new jFormsControl".$dt."('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControl".$dt."('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-        if ($isLocale)
-jForms.tControl
+c
-
-        $maxl= $ctrl->datatype->getFacet('maxLength');
-        if($maxl !== null)
-jForms.tControl
+c
-
-        $minl= $ctrl->datatype->getFacet('minLength');
-        if($minl !== null)
-jForms.tControl
+c
-
-        $this->commonJs($ctrl);
@@ -273 +279 @@
-    protected function jsCheckbox($ctrl) {
-
-jForms.tControl = new jFormsControlBoolean('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlBoolean('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-
-        $this->commonJs($ctrl);
@@ -309 +315 @@
-    protected function jsCheckboxes($ctrl) {
-
-jForms.tControl = new jFormsControlString('".$ctrl->ref."[]', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlString('".$ctrl->ref."[]', ".$this->escJsStr($ctrl->label)."
-
-        $this->commonJs($ctrl);
@@ -334 +340 @@
-    protected function jsRadiobuttons($ctrl) {
-
-jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlString('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-
-        $this->commonJs($ctrl);
@@ -359 +365 @@
-    protected function jsMenulist($ctrl) {
-
-jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlString('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-
-        $this->commonJs($ctrl);
@@ -402 +408 @@
-    protected function jsListbox($ctrl) {
-        if($ctrl->multiple){
-jForms.tControl = new jFormsControlString('".$ctrl->ref."[]', '".str_replace("'","\'",$ctrl->label)."'
-jForms.tControl
+c = new jFormsControlString('".$ctrl->ref."[]', ".$this->escJsStr($ctrl->label)."
+c
-        } else {
-jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlString('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-        }
-
@@ -418 +424 @@
-
-    protected function jsTextarea($ctrl) {
-jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlString('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-
-        $maxl= $ctrl->datatype->getFacet('maxLength');
-        if($maxl !== null)
-jForms.tControl
+c
-
-        $minl= $ctrl->datatype->getFacet('minLength');
-        if($minl !== null)
-jForms.tControl
+c
-
-        $this->commonJs($ctrl);
@@ -464 +470 @@
-    protected function jsSecretconfirm($ctrl) {
-        // we assume that a secret confirm control is just after a secret control in the list of controls
-jForms.tControl.confirmField = new jFormsControlSecretConfirm('".$ctrl->ref."_confirm', '".str_replace("'","\\'",$ctrl->label)."'
+c.confirmField = new jFormsControlSecretConfirm('".$ctrl->ref."_confirm', ".$this->escJsStr($ctrl->label)."
-    }
-
@@ -485 +491 @@
-
-    protected function jsUpload($ctrl) {
-jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlString('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-
-        $this->commonJs($ctrl);
@@ -557 +563 @@
-        $id=' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'_';
-        $this->jsChoiceInternal($ctrl);
-jForms.tControl2 = jForms.tControl
+c2 = c
-        $this->isRootControl = false;
-        foreach( $ctrl->items as $itemName=>$listctrl){
@@ -579 +585 @@
-                if($ro) $c->setReadOnly(true);
-                echo "</span>\n";
-jForms.tControl2.addControl(jForms.tControl, '".str_replace("'","\\'",$itemName)."'
+c2.addControl(c, ".$this->escJsStr($itemName)."
-            }
-            if(!$displayedControls) {
-jForms.tControl2.items['".str_replace("'","\\'",$itemName)."'
+c2.items[".$this->escJsStr($itemName)."
-            }
-
@@ -600 +606 @@
-                $value='';
-        }
-jForms.tControl
+c
-    }
-
-    protected function jsChoiceInternal($ctrl) {
-
-jForms.tControl = new jFormsControlChoice('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."'
+c = new jFormsControlChoice('".$ctrl->ref."', ".$this->escJsStr($ctrl->label)."
-
-        $this->commonJs($ctrl);