Changeset 1050

Timestamp:

08/16/08 00:45:43 (4 months ago)

Author:

laurentj

Message:

jforms: a form can now fully modified dynamically. remove the compiler part of a jforms plugin.

Files:

• branches/experimental/jforms-groups/build/manifests/jelix-lib.mn (modified) (2 diffs)
• branches/experimental/jforms-groups/lib/jelix-www/js/jforms.js (modified) (6 diffs)
• branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler.class.php (modified) (3 diffs)
• branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php (modified) (6 diffs)
• branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php (modified) (1 diff)
• branches/experimental/jforms-groups/lib/jelix/forms/jFormsControl.class.php (modified) (3 diffs)
• branches/experimental/jforms-groups/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (22 diffs)
• branches/experimental/jforms-groups/lib/jelix/plugins/jforms/html/html.jformscompiler.php (deleted)
• branches/experimental/jforms-groups/lib/jelix/plugins/tpl/html/block.formcontrols.php (modified) (3 diffs)
• branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (8 diffs)
• branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.compiler_1_1.html_cli.php (modified) (5 diffs)
• branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (64 diffs)
• branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.htmlbuilder2.html_cli.php (modified) (7 diffs)
• trunk/build/manifests/jelix-lib.mn (modified) (2 diffs)
• trunk/lib/jelix-www/js/jforms.js (modified) (6 diffs)
• trunk/lib/jelix/forms/jFormsCompiler.class.php (modified) (3 diffs)
• trunk/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php (modified) (6 diffs)
• trunk/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (3 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (22 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformscompiler.php (deleted)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (8 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler_1_1.html_cli.php (modified) (5 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (64 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder2.html_cli.php (modified) (7 diffs)

branches/experimental/jforms-groups/build/manifests/jelix-lib.mn

@@ -358 +358 @@
-  history.coord.ini.php.dist
-
-cd lib/jelix/plugins/jforms/html
-  html.jformscompiler.php
-  html.jformsbuilder.php
-
-
-cd lib/jelix/plugins/db/intuition
-  intuition.dbconnection.php
@@ -390 +385 @@
-  oci.daobuilder.php
-  oci.dbtools.php
+
+cd lib/jelix/plugins/jforms/html
+  html.jformsbuilder.php
-
-cd lib/jelix/plugins/tpl/common

branches/experimental/jforms-groups/lib/jelix-www/js/jforms.js

@@ -404 +404 @@
- * control with LocaleDateTime
- */
-d
+D
-    this.name = name;
-    this.label = label;
@@ -413 +413 @@
-    this.lang='';
-};
-d
+D
-    var yy, mm, dd, th, tm, ts;
-    if(this.lang.indexOf('fr_') == 0) {
@@ -449 +449 @@
- * control with localedate
- */
-d
+D
-    this.name = name;
-    this.label = label;
@@ -458 +458 @@
-    this.lang='';
-};
-d
+D
-    var yy, mm, dd;
-    if(this.lang.indexOf('fr_') == 0) {
@@ -551 +551 @@
-    this.name = name;
-    this.label = label;
-tru
+fals
-    this.errInvalid = '';
-    this.errRequired = '';
@@ -599 +599 @@
-};
-
-
-
-/**
- * Decorator to display errors in an alert dialog box

branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler.class.php

@@ -54 +54 @@
-
-        $srcBuilders=array();
-        $buildersCompilers = array();
-        foreach($gJConfig->_pluginsPathList_jforms as $buildername => $pluginPath) {
-            require_once($pluginPath.$buildername.'.jformscompiler.php');
-            $classname = $buildername.'JformsCompiler';
-            $buildersCompilers[$buildername] = new $classname($compiler);
-
-            $srcBuilders[$buildername]=array();
-            $srcBuilders[$buildername][] = '<?php ';
-            $srcBuilders[$buildername][] = ' require_once(\''.$pluginPath.$buildername.'.jformsbuilder.php\'); ';
-'.'
+
-            $srcBuilders[$buildername][] = ' public function __construct($form){';
- 
+
-            $srcBuilders[$buildername][] = '  }';
-
-
+
-            $source[]='    \''.$buildername.'\'=>array(\''.$selector->getCompiledBuilderFilePath($buildername).'\',\''.$selector->getClass().'_builder_'.$buildername.'\'), ';
-        }
@@ -74 +68 @@
-        $source[]='    );';
-        $source[]=' public function __construct($sel, &$container, $reset = false){';
- 
+
-
-, $buildersCompilers
+
-
-        $source[]="  }\n} ?>";
@@ -82 +76 @@
-
-        foreach($gJConfig->_pluginsPathList_jforms as $buildername => $pluginPath) {
-            $srcBuilders[$buildername][]= $buildersCompilers[$buildername]->endCompile();
-            $srcBuilders[$buildername][]= '} ?>';
-            jFile::write($selector->getCompiledBuilderFilePath($buildername), implode("\n", $srcBuilders[$buildername]));

branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler_jf_1_0.class.php

@@ -25 +25 @@
-
-    protected $srcBuilders;
-    protected $buildersCompilers;
-
-    public function __construct($sourceFile) {
@@ -31 +30 @@
-    }
-
-, &$buildersCompilers
+
-
-        global $gJConfig;
-
-        $this->srcBuilders = &$srcBuilders;
-        $this->buildersCompilers = &$buildersCompilers;
-
-        $xml = simplexml_import_dom($doc);
@@ -45 +43 @@
-        foreach ($xml->children() as $controltype=>$control) {
-            $source[] = $this->generatePHPControl($controltype, $control);
-            //foreach($gJConfig->_pluginsPathList_jforms as $buildername => $pluginPath) {
-            //    $srcBuilders[$buildername][]= $buildersCompilers[$buildername]->generateControl($controltype, $control);
-            foreach($buildersCompilers as $buildername => $builder) {
-                $srcBuilders[$buildername][]= $builder->generateControl($controltype, $control);
-            }
-        }
-    }
@@ -167 +160 @@
-        $this->attrDefaultvalue($source, $attributes);
-        $this->readLabel($source, $control, 'output');
-
+//
-        return false;
-    }
@@ -274 +267 @@
-
-            if(isset($control->help)){
-asHelp=true
+elp=$ctrl->help
-            }
-            if(isset($control->hint)){
@@ -359 +352 @@
-    protected function readHelpHintAlert(&$source, $control) {
-        if(isset($control->help)){ // help value is readed in the html compiler
-
+
+
+
+
+
-        }
-        if(isset($control->hint)){

branches/experimental/jforms-groups/lib/jelix/forms/jFormsCompiler_jf_1_1.class.php

@@ -191 +191 @@
-                $src[]='$topctrl->addChildControl($ctrl2'.$itemname.');';
-            $source[]= implode("\n", $src);
-            /*foreach($gJConfig->_pluginsPathList_jforms as $buildername => $pluginPath) {
-                $this->srcBuilders[$buildername][]= $this->buildersCompilers[$buildername]->generateControl($ctrltype, $control);
-            }*/
-        }
-        return $ctrlcount;

branches/experimental/jforms-groups/lib/jelix/forms/jFormsControl.class.php

@@ -23 +23 @@
-    public $label='';
-    public $defaultValue='';
-asHelp = false
+elp = ''
-    public $hint='';
-    public $alertInvalid='';
@@ -199 +199 @@
-    public $type='secretconfirm';
-    public $size=0;
+    /**
+     * ref value of the associated secret control
+     */
-    public $primarySecret='';
-
@@ -265 +268 @@
-class jFormsControlOutput extends jFormsControl {
-    public $type='output';
+
+    function setValueFromRequest($request) {
+    }
-
-    public function check(){

branches/experimental/jforms-groups/lib/jelix/plugins/jforms/html/html.jformsbuilder.php

@@ -17 +17 @@
- */
-abstract class htmlJformsBuilder extends jFormsBuilderBase {
+
+    protected $options;
+
+    protected $isRootControl = true;
-
-    public function outputAllControls() {
@@ -89 +93 @@
-     */
-    public function outputHeader($params){
-param
+this->option
-                 'helpDecorator'=>'jFormsHelpDecoratorAlert', 'method'=>'post'), $params);
-
-        $url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
-scriptName,$url->pathInfo,'" method="'.$param
+getPath(),'" method="'.$this->option
-        if($this->_form->hasUpload())
-            echo ' enctype="multipart/form-data">';
@@ -99 +103 @@
-            echo '>';
-
+        echo '<script type="text/javascript">
+//<![CDATA[
+jForms.tForm = new jFormsForm(\''.$this->_name.'\');
+jForms.tForm.setErrorDecorator(new '.$this->options['errorDecorator'].'());
+jForms.tForm.setHelpDecorator(new '.$this->options['helpDecorator'].'());
+jForms.declareForm(jForms.tForm);
+//]]>
+</script>';
+
+
-        if(count($url->params) || count($this->_form->getHiddens())){
-            echo '<div class="jforms-hiddens">';
@@ -110 +124 @@
-            echo '</div>';
-        }
-
-
-
-
-
+
-        $errors = $this->_form->getContainer()->errors;
-        if(count($errors)){
@@ -143 +153 @@
-    }
-
+    protected $jsContent = '';
+
-    public function outputFooter(){
+        echo '<script type="text/javascript">
+//<![CDATA[
+'.$this->jsContent.'
+//]]>
+</script>';
-        echo '</form>';
-    }
@@ -171 +188 @@
-        $hint = ($ctrl->hint == ''?'':' title="'.htmlspecialchars($ctrl->hint).'"');
-        $this->{'output'.$ctrl->type}($ctrl, $id, $class, $readonly, $hint);
+        $this->{'js'.$ctrl->type}($ctrl);
-        $this->outputHelp($ctrl);
+    }
+
+    protected function commonJs($ctrl) {
+        if($ctrl->help){
+            $this->jsContent .="jForms.tControl.help='".str_replace("'","\\'",$ctrl->help)."';\n";
+        }
+
+        if($ctrl->required){
+            $this->jsContent .="jForms.tControl.required = true;\n";
+            if($ctrl->alertRequired){
+                $this->jsContent .="jForms.tControl.errRequired='".str_replace("'","\\'",$ctrl->alertRequired)."';\n";
+            }
+            else {
+                $this->jsContent .="jForms.tControl.errRequired='".str_replace("'","\\'",jLocale::get('jelix~formserr.js.err.required', $ctrl->label))."';\n";
+            }
+        }
+
+        if($ctrl->alertInvalid){
+            $this->jsContent .="jForms.tControl.errInvalid='".str_replace("'","\\'",$ctrl->alertInvalid)."';\n";
+        }
+        else {
+            $this->jsContent .="jForms.tControl.errInvalid='".str_replace("'","\\'",jLocale::get('jelix~formserr.js.err.invalid', $ctrl->label))."';\n";
+        }
+
+        if ($this->isRootControl) $this->jsContent .="jForms.tForm.addControl(jForms.tControl);\n";
-    }
-
@@ -185 +228 @@
-    }
-
+    protected function jsInput($ctrl) {
+
+        $datatype = array('jDatatypeBoolean'=>'Boolean','jDatatypeDecimal'=>'Decimal','jDatatypeInteger'=>'Integer','jDatatypeHexadecimal'=>'Hexadecimal',
+                        'jDatatypeDatetime'=>'Datetime','jDatatypeDate'=>'Date','jDatatypeTime'=>'Time',
+                        'jDatatypeUrl'=>'Url','jDatatypeEmail'=>'Email','jDatatypeIPv4'=>'Ipv4','jDatatypeIPv6'=>'Ipv6');
+        $isLocale = false;
+        if(isset($datatype[get_class($ctrl)]))
+            $dt = $datatype[get_class($ctrl)];
+        else if ($ctrl->datatype instanceof jDatatypeLocaleTime)
+            { $dt = 'Time'; $isLocale = true; }
+        else if ($ctrl->datatype instanceof jDatatypeLocaleDate)
+            { $dt = 'LocaleDate'; $isLocale = true; }
+        else if ($ctrl->datatype instanceof jDatatypeLocaleDateTime)
+            { $dt = 'LocaleDatetime'; $isLocale = true; }
+        else
+            $dt = 'String';
+
+        $this->jsContent .="jForms.tControl = new jFormsControl".$dt."('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."');\n";
+        if ($isLocale)
+            $this->jsContent .="jForms.tControl.lang='".$GLOBALS['gJConfig']->locale."';\n";
+
+        $maxl= $ctrl->datatype->getFacet('maxLength');
+        if($maxl !== null)
+            $this->jsContent .="jForms.tControl.maxLength = '$maxl';\n";
+
+        $minl= $ctrl->datatype->getFacet('minLength');
+        if($minl !== null)
+            $this->jsContent .="jForms.tControl.minLength = '$minl';\n";
+
+        $this->commonJs($ctrl);
+    }
+
-    protected function outputCheckbox($ctrl, $id, $class, $readonly, $hint) {
-        $value = $this->_form->getData($ctrl->ref);
@@ -194 +269 @@
-        }
-        echo '<input type="checkbox"',$id,$readonly,$hint,$class,$v,' value="',$ctrl->valueOnCheck,'"',$this->_endt;
+    }
+
+    protected function jsCheckbox($ctrl) {
+
+        $this->jsContent .="jForms.tControl = new jFormsControlBoolean('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."');\n";
+
+        $this->commonJs($ctrl);
-    }
-
@@ -225 +307 @@
-    }
-
+    protected function jsCheckboxes($ctrl) {
+
+        $this->jsContent .="jForms.tControl = new jFormsControlString('".$ctrl->ref."[]', '".str_replace("'","\'",$ctrl->label)."');\n";
+
+        $this->commonJs($ctrl);
+    }
+
-    protected function outputRadiobuttons($ctrl, $id, $class, $readonly, $hint) {
-        $i=0;
@@ -243 +332 @@
-    }
-
+    protected function jsRadiobuttons($ctrl) {
+
+        $this->jsContent .="jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."');\n";
+
+        $this->commonJs($ctrl);
+    }
+
-    protected function outputMenulist($ctrl, $id, $class, $readonly, $hint) {
-        echo '<select',$id,$hint,$class,' size="1">';
@@ -259 +355 @@
-        }
-        echo '</select>';
+    }
+
+    protected function jsMenulist($ctrl) {
+
+        $this->jsContent .="jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."');\n";
+
+        $this->commonJs($ctrl);
-    }
-
@@ -297 +400 @@
-    }
-
+    protected function jsListbox($ctrl) {
+        if($ctrl->multiple){
+            $this->jsContent .= "jForms.tControl = new jFormsControlString('".$ctrl->ref."[]', '".str_replace("'","\'",$ctrl->label)."');\n";
+            $this->jsContent .= "jForms.tControl.multiple = true;\n";
+        } else {
+            $this->jsContent .="jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."');\n";
+        }
+
+        $this->commonJs($ctrl);
+    }
+
-    protected function outputTextarea($ctrl, $id, $class, $readonly, $hint) {
-        $value = $this->_form->getData($ctrl->ref);
@@ -303 +417 @@
-    }
-
+    protected function jsTextarea($ctrl) {
+        $this->jsContent .="jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."');\n";
+
+        $maxl= $ctrl->datatype->getFacet('maxLength');
+        if($maxl !== null)
+            $this->jsContent .="jForms.tControl.maxLength = '$maxl';\n";
+
+        $minl= $ctrl->datatype->getFacet('minLength');
+        if($minl !== null)
+            $this->jsContent .="jForms.tControl.minLength = '$minl';\n";
+
+        $this->commonJs($ctrl);
+    }
+
-    protected function outputHtmleditor($ctrl, $id, $class, $readonly, $hint) {
-        $engine = $GLOBALS['gJConfig']->htmleditors[$ctrl->config.'.engine.name'];
-        echo '<script type="text/javascript">
-//<![CDATA[
-jelix_',$engine,'_',$ctrl->config.'("',$this->_name,'_',$ctrl->ref,'","',$this->_name,'");
-//]]>
-</script>';
-
-        $value = $this->_form->getData($ctrl->ref);
-        $rows = ' rows="'.$ctrl->rows.'" cols="'.$ctrl->cols.'"';
-        echo '<textarea',$id,$readonly,$hint,$class,$rows,'>',htmlspecialchars($value),'</textarea>';
+    }
+
+    protected function jsHtmleditor($ctrl) {
+        $this->jsTextarea($ctrl);
+        $engine = $GLOBALS['gJConfig']->htmleditors[$ctrl->config.'.engine.name'];
+        $this->jsContent .= 'jelix_'.$engine.'_'.$ctrl->config.'("'.$this->_name.'_'.$ctrl->ref.'","'.$this->_name."\");\n";
-    }
-
@@ -321 +448 @@
-    }
-
+    protected function jsSecret($ctrl) {
+        $this->jsTextarea($ctrl);
+    }
+
-    protected function outputSecretconfirm($ctrl, $id, $class, $readonly, $hint) {
-        $size = ($ctrl->size == 0?'': ' size="'.$ctrl->size.'"');
@@ -326 +457 @@
-    }
-
+    protected function jsSecretconfirm($ctrl) {
+        // we assume that a secret confirm control is just after a secret control in the list of controls
+        $this->jsContent .= "jForms.tControl.confirmField = new jFormsControlSecretConfirm('".$ctrl->ref."_confirm', '".str_replace("'","\\'",$ctrl->label)."');\n";
+    }
+
-    protected function outputOutput($ctrl, $id, $class, $readonly, $hint) {
-        $value = $this->_form->getData($ctrl->ref);
-        echo '<input type="hidden"',$id,' value="',htmlspecialchars($value),'"',$this->_endt;
-        echo '<span class="jforms-value"',$hint,'>',htmlspecialchars($value),'</span>';
+    }
+
+    protected function jsOutput($ctrl) {
-    }
-
@@ -338 +477 @@
-        echo '<input type="file"',$id,$readonly,$hint,$class,' value=""',$this->_endt; // ',htmlspecialchars($this->_form->getData($ctrl->ref)),'
-
+    }
+
+    protected function jsUpload($ctrl) {
+        $this->jsContent .="jForms.tControl = new jFormsControlString('".$ctrl->ref."', '".str_replace("'","\'",$ctrl->label)."');\n";
+
+        $this->commonJs($ctrl);
-    }
-
@@ -352 +497 @@
-    }
-
+    protected function jsSubmit($ctrl) {
+        // no javascript
+    }
+
-    protected function outputReset($ctrl, $id, $class, $readonly, $hint) {
-        echo '<button type="reset"',$id,$hint,' class="jforms-reset">',htmlspecialchars($ctrl->label),'</button>';
+    }
+
+    protected function jsReset($ctrl) {
+        // no javascript
-    }
-
@@ -360 +513 @@
-        echo '<span class="jforms-captcha-question">',htmlspecialchars($ctrl->question),'</span> ';
-        echo '<input type="text"',$id,$hint,$class,' value=""',$this->_endt;
+    }
+
+    protected function jsCaptcha($ctrl) {
+        $this->jsTextarea($ctrl);
-    }
-
@@ -377 +534 @@
-    }
-
+    protected function jsGroup($ctrl) {
+        //no javacript
+    }
+
-    protected function outputChoice($ctrl, $id, $class, $readonly, $hint) {
-        echo '<ul class="jforms-choice jforms-ctl-'.$ctrl->ref.'" >',"\n";
@@ -390 +551 @@
-        $i=0;
-        $id=' name="'.$ctrl->ref.'" id="'.$this->_name.'_'.$ctrl->ref.'_';
+        $this->jsChoiceInternal($ctrl);
+        $this->jsContent .="jForms.tControl2 = jForms.tControl;\n";
+        $this->isRootControl = false;
-        foreach( $ctrl->items as $itemName=>$listctrl){
-            echo '<li><label><input type="radio"',$id,$i,'" value="',htmlspecialchars($itemName),'"';
@@ -401 +565 @@
-                // we remove readonly status so when a user change the choice and 
-                // javascript is deactivated, it can still change the value of the control
- && $readonly != ''
-
+
+ && $readonly != ''
-                $this->outputControlLabel($c);
-                echo ' ';
-                $this->outputControl($c);
-$ro
+true
-                echo "</span>\n";
-
+
+
+
+
+
+
-            echo "</li>\n";
-            $i++;
-        }
-        echo "</ul>\n";
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    protected function outputHelp($ctrl) {
-asH
+
-            if($ctrl->type == 'checkboxes' || ($ctrl->type == 'listbox' && $ctrl->multiple)){
-                $name=$ctrl->ref.'[]';
@@ -432 +613 @@
-        }
-    }
-
-    abstract public function getJavascriptCheck($errDecorator,$helpDecorator);
-}

branches/experimental/jforms-groups/lib/jelix/plugins/tpl/html/block.formcontrols.php

@@ -4 +4 @@
-* @subpackage  jtpl_plugin
-* @author      Jouanneau Laurent
-
-
+, Alexis Métaireau
+, 2008 Alexis Métaireau
-* @link        http://www.jelix.org
-* @licence     GNU Lesser General Public Licence see LICENCE file or http://www.gnu.org/licenses/lgpl.html
@@ -51 +51 @@
-        }
-        elseif(count($param) == 2){
-
+ || '.$param[0].' === null
-                $ctrls_to_display = '.$param[0].';
-                $ctrls_notto_display = '.$param[1].';
@@ -95 +95 @@
-       && (  ($ctrls_to_display===null && $ctrls_notto_display === null)
-          || ($ctrls_to_display===null && !in_array($ctrlref, $ctrls_notto_display))
-in_array($ctrlref, $ctrls_to_display
+(is_array($ctrls_to_display) && in_array($ctrlref, $ctrls_to_display) 
-        $t->_privateVars[\'__ctrlref\'] = $ctrlref;
-        $t->_privateVars[\'__ctrl\'] = $ctrl;

branches/experimental/jforms-groups/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -16 +16 @@
-require_once(JELIX_LIB_PATH.'forms/jFormsDatasource.class.php');
-require_once(JELIX_LIB_UTILS_PATH.'jDatatype.class.php');
-require_once(JELIX_LIB_PATH.'plugins/jforms/html/html.jformscompiler.php');
-
-
-
@@ -27 +25 @@
-
-    public function testPhpForm($doc){
-$dummyCompilers = 
-, $dummyCompilers
+
+
-    }
-
@@ -35 +33 @@
-    }
-}
-
-class testHtmlJformsCompiler extends htmlJformsCompiler {
-   public function testControl($controltype, $control){
-        return $this->generateControl($controltype, $control);
-   }
-}
-
-
-class UTjformsCompiler extends jUnitTestCase {
@@ -510 +501 @@
-42=>'$ctrl= new jFormsControlinput(\'nom\');
-$ctrl->label=\'Votre nom\';
-asHelp=true
+elp=\'vous devez indiquer votre nom\'
-$this->addControl($ctrl);',
-43=>'$ctrl= new jFormsControlinput(\'nom\');
@@ -653 +644 @@
-);
-
-
-    protected $_JsControls = array(
-0=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-1=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-2=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.required = true;\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-3=>'$label = jLocale::get(\'foo~bar\');
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-4=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-5=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlSecret(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-6=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-7=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-/*8=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-9=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',*/
-10=>'',
-11=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-12=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlBoolean(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-13=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlDecimal(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-14=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlInteger(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-15=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlHexadecimal(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-16=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlDatetime(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-17=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlDate(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-18=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlTime(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-19=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlLocaledatetime(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.lang=\'".$GLOBALS[\'gJConfig\']->locale."\';\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-20=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlLocaledate(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.lang=\'".$GLOBALS[\'gJConfig\']->locale."\';\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-21=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlTime(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.lang=\'".$GLOBALS[\'gJConfig\']->locale."\';\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-22=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlUrl(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-23=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlEmail(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-24=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlIpv4(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-25=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlIpv6(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-26=>'$label = \'Avez-vous un nom ?\';
-$js.="jForms.tControl = new jFormsControlBoolean(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-27=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom[]\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-28=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom[]\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-29=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-30=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',
-31=>'$label = \'Votre nom\';
-$js.="jForms.tControl = new jFormsControlString(\'nom\', \'".str_replace("\'","\\\'",$label)."\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";
-$js.="jForms.tControl.errInvalid =\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.invalid\', $label))."\';\n";
-$js.="jForms.tForm.addControl(jForms.tControl);\n";',