Changeset 862

Timestamp:

04/04/08 14:49:15 (8 months ago)

Author:

laurentj

Message:

remove the use of the engine attribute on htmleditor tag, and fixed some little bug on some jforms plugins

Files:

• trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
• trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
• trunk/build/manifests/jelix-lib.mn (modified) (1 diff)
• trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
• trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
• trunk/lib/jelix-www/js/jforms.js (modified) (1 diff)
• trunk/lib/jelix-www/wymeditor/config/default.js (moved) (moved from trunk/lib/jelix-www/wymeditor/config/simple.js) (1 diff)
• trunk/lib/jelix-www/wymeditor/config/default.js (moved) (moved from trunk/lib/jelix-www/wymeditor/config/simple.js) (1 diff)
• trunk/lib/jelix-www/wymeditor/config/default.js (moved) (moved from trunk/lib/jelix-www/wymeditor/config/simple.js) (1 diff)
• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
• trunk/lib/jelix/core/defaultconfig.ini.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (1 diff)
• trunk/lib/jelix/forms/jFormsControl.class.php (modified) (1 diff)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (2 diffs)
• trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/block.form.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/function.formdatafull.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/function.formdatafull.php (modified) (1 diff)
• trunk/lib/jelix/plugins/tpl/html/function.formdatafull.php (modified) (1 diff)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php (modified) (3 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (9 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (9 diffs)
• trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (9 diffs)

trunk/build/manifests/jelix-lib.mn

@@ -565 +565 @@
-  icons.png
-cd lib/jelix-www/wymeditor/config
-simple
+default
-cd lib/jelix-www/jquery
-  GPL-LICENSE.txt

trunk/build/manifests/jelix-lib.mn

@@ -565 +565 @@
-  icons.png
-cd lib/jelix-www/wymeditor/config
-simple
+default
-cd lib/jelix-www/jquery
-  GPL-LICENSE.txt

trunk/build/manifests/jelix-lib.mn

@@ -565 +565 @@
-  icons.png
-cd lib/jelix-www/wymeditor/config
-simple
+default
-cd lib/jelix-www/jquery
-  GPL-LICENSE.txt

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

@@ -43 +43 @@
-    declareForm : function(aForm){
-        this._forms[aForm.name]=aForm;
+        var elem = document.getElementById(aForm.name);
+
+        if (elem.addEventListener) {
+            elem.addEventListener("submit", function (ev) { if(!jForms.verifyForm(elem)) {ev.preventDefault(); ev.stopPropagation(); return false;} return true; }, false);
+        } else if (elem.attachEvent) {
+            elem.attachEvent("onsubmit", function (ev) { if(!jForms.verifyForm(elem)) { window.event.cancelBubble = true ; window.event.returnValue = false; return false;} return true;});
+        }
-    },
-

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

@@ -43 +43 @@
-    declareForm : function(aForm){
-        this._forms[aForm.name]=aForm;
+        var elem = document.getElementById(aForm.name);
+
+        if (elem.addEventListener) {
+            elem.addEventListener("submit", function (ev) { if(!jForms.verifyForm(elem)) {ev.preventDefault(); ev.stopPropagation(); return false;} return true; }, false);
+        } else if (elem.attachEvent) {
+            elem.attachEvent("onsubmit", function (ev) { if(!jForms.verifyForm(elem)) { window.event.cancelBubble = true ; window.event.returnValue = false; return false;} return true;});
+        }
-    },
-

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

@@ -43 +43 @@
-    declareForm : function(aForm){
-        this._forms[aForm.name]=aForm;
+        var elem = document.getElementById(aForm.name);
+
+        if (elem.addEventListener) {
+            elem.addEventListener("submit", function (ev) { if(!jForms.verifyForm(elem)) {ev.preventDefault(); ev.stopPropagation(); return false;} return true; }, false);
+        } else if (elem.attachEvent) {
+            elem.attachEvent("onsubmit", function (ev) { if(!jForms.verifyForm(elem)) { window.event.cancelBubble = true ; window.event.returnValue = false; return false;} return true;});
+        }
-    },
-

trunk/lib/jelix-www/wymeditor/config/default.js

@@ -1 +1 @@
-
-simple
+default
-
-  jQuery(function() {

trunk/lib/jelix-www/wymeditor/config/default.js

@@ -1 +1 @@
-
-simple
+default
-
-  jQuery(function() {

trunk/lib/jelix-www/wymeditor/config/default.js

@@ -1 +1 @@
-
-simple
+default
-
-  jQuery(function() {

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -221 +221 @@
-
-[htmleditors]
-
-
-
-
-
+
+
+
+
+
+

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -221 +221 @@
-
-[htmleditors]
-
-
-
-
-
+
+
+
+
+
+

trunk/lib/jelix/core/defaultconfig.ini.php

@@ -221 +221 @@
-
-[htmleditors]
-
-
-
-
-
+
+
+
+
+
+

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

@@ -88 +88 @@
-    public $rows=5;
-    public $cols=40;
-
-
+
-    public $skin='default';
-    function __construct($ref){

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

@@ -88 +88 @@
-    public $rows=5;
-    public $cols=40;
-
-
+
-    public $skin='default';
-    function __construct($ref){

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

@@ -88 +88 @@
-    public $rows=5;
-    public $cols=40;
-
-
+
-    public $skin='default';
-    function __construct($ref){

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

@@ -25 +25 @@
-    public function outputHeader($params){
-        $url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
- onsubmit="return jForms.verifyForm(this)"
+
-        if($this->_form->hasUpload())
-            echo ' enctype="multipart/form-data">';
@@ -214 +214 @@
-            break;
-        case 'htmleditor':
+            $engine = $GLOBALS['gJConfig']->htmleditors[$ctrl->config.'.engine.name'];
-            echo '<script type="text/javascript">
-            //<![CDATA[
-ctrl->
+
-            //]]>
-            </script>';

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

@@ -25 +25 @@
-    public function outputHeader($params){
-        $url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
- onsubmit="return jForms.verifyForm(this)"
+
-        if($this->_form->hasUpload())
-            echo ' enctype="multipart/form-data">';
@@ -214 +214 @@
-            break;
-        case 'htmleditor':
+            $engine = $GLOBALS['gJConfig']->htmleditors[$ctrl->config.'.engine.name'];
-            echo '<script type="text/javascript">
-            //<![CDATA[
-ctrl->
+
-            //]]>
-            </script>';

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

@@ -25 +25 @@
-    public function outputHeader($params){
-        $url = jUrl::get($this->_action, $this->_actionParams, 2); // retourne le jurl correspondant
- onsubmit="return jForms.verifyForm(this)"
+
-        if($this->_form->hasUpload())
-            echo ' enctype="multipart/form-data">';
@@ -214 +214 @@
-            break;
-        case 'htmleditor':
+            $engine = $GLOBALS['gJConfig']->htmleditors[$ctrl->config.'.engine.name'];
-            echo '<script type="text/javascript">
-            //<![CDATA[
-ctrl->
+
-            //]]>
-            </script>';

trunk/lib/jelix/plugins/tpl/html/block.form.php

@@ -76 +76 @@
-        if($v instanceof jFormsBase && count($edlist = $v->getHtmlEditors())) {
-            foreach($edlist as $ed) {
-engine
-engine
-engine
+config.\'.engine.file\'
+config.\'.engine.file\'
+config.\'.engine.file\'
-                            $gJCoord->response->addJSLink($bp.$url);
-                        }
-                    }else
-engine
+config.\'.engine.file\'
-                }
-engine.\'.config.\'.$ed->config
-engine.\'.config.\'.$ed->config
-engine
-engine
+config.\'.config\'
+config.\'.config\'
+config
+config
-            }
-        }

trunk/lib/jelix/plugins/tpl/html/block.form.php

@@ -76 +76 @@
-        if($v instanceof jFormsBase && count($edlist = $v->getHtmlEditors())) {
-            foreach($edlist as $ed) {
-engine
-engine
-engine
+config.\'.engine.file\'
+config.\'.engine.file\'
+config.\'.engine.file\'
-                            $gJCoord->response->addJSLink($bp.$url);
-                        }
-                    }else
-engine
+config.\'.engine.file\'
-                }
-engine.\'.config.\'.$ed->config
-engine.\'.config.\'.$ed->config
-engine
-engine
+config.\'.config\'
+config.\'.config\'
+config
+config
-            }
-        }

trunk/lib/jelix/plugins/tpl/html/block.form.php

@@ -76 +76 @@
-        if($v instanceof jFormsBase && count($edlist = $v->getHtmlEditors())) {
-            foreach($edlist as $ed) {
-engine
-engine
-engine
+config.\'.engine.file\'
+config.\'.engine.file\'
+config.\'.engine.file\'
-                            $gJCoord->response->addJSLink($bp.$url);
-                        }
-                    }else
-engine
+config.\'.engine.file\'
-                }
-engine.\'.config.\'.$ed->config
-engine.\'.config.\'.$ed->config
-engine
-engine
+config.\'.config\'
+config.\'.config\'
+config
+config
-            }
-        }

trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php

@@ -33 +33 @@
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    ');

trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php

@@ -33 +33 @@
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    ');

trunk/lib/jelix/plugins/tpl/html/cfunction.formfull.php

@@ -33 +33 @@
-    }
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-    ');

trunk/lib/jelix/plugins/tpl/html/function.formdatafull.php

@@ -37 +37 @@
-            }
-            echo substr($s, 1);
+        }elseif($ctrl->datatype instanceof jDatatypeHtml) {
+            echo $value;
-        }else
-            echo htmlspecialchars($value);

trunk/lib/jelix/plugins/tpl/html/function.formdatafull.php

@@ -37 +37 @@
-            }
-            echo substr($s, 1);
+        }elseif($ctrl->datatype instanceof jDatatypeHtml) {
+            echo $value;
-        }else
-            echo htmlspecialchars($value);

trunk/lib/jelix/plugins/tpl/html/function.formdatafull.php

@@ -37 +37 @@
-            }
-            echo substr($s, 1);
+        }elseif($ctrl->datatype instanceof jDatatypeHtml) {
+            echo $value;
-        }else
-            echo htmlspecialchars($value);

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -299 +299 @@
-</captcha>',
-72=>'<htmleditor ref="contenu" xmlns="http://jelix.org/ns/forms/1.0">
+    <label>Texte</label>
+</htmleditor>',
+73=>'<htmleditor ref="contenu" config="simple" xmlns="http://jelix.org/ns/forms/1.0">
-    <label>Texte</label>
-</htmleditor>',
@@ -676 +679 @@
-$ctrl->label=\'Texte\';
-$this->addControl($ctrl);',
+73=>'$ctrl= new jFormsControlhtmleditor(\'contenu\');
+$ctrl->label=\'Texte\';
+$ctrl->config=\'simple\';
+$this->addControl($ctrl);',
-);
-
@@ -1051 +1058 @@
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-72=>'$label = \'Texte\';
+$js.="jForms.tControl = new jFormsControl(\'contenu\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\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";',
+73=>'$label = \'Texte\';
-$js.="jForms.tControl = new jFormsControl(\'contenu\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -299 +299 @@
-</captcha>',
-72=>'<htmleditor ref="contenu" xmlns="http://jelix.org/ns/forms/1.0">
+    <label>Texte</label>
+</htmleditor>',
+73=>'<htmleditor ref="contenu" config="simple" xmlns="http://jelix.org/ns/forms/1.0">
-    <label>Texte</label>
-</htmleditor>',
@@ -676 +679 @@
-$ctrl->label=\'Texte\';
-$this->addControl($ctrl);',
+73=>'$ctrl= new jFormsControlhtmleditor(\'contenu\');
+$ctrl->label=\'Texte\';
+$ctrl->config=\'simple\';
+$this->addControl($ctrl);',
-);
-
@@ -1051 +1058 @@
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-72=>'$label = \'Texte\';
+$js.="jForms.tControl = new jFormsControl(\'contenu\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\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";',
+73=>'$label = \'Texte\';
-$js.="jForms.tControl = new jFormsControl(\'contenu\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";

trunk/testapp/modules/jelix_tests/tests/jforms.compiler.html_cli.php

@@ -299 +299 @@
-</captcha>',
-72=>'<htmleditor ref="contenu" xmlns="http://jelix.org/ns/forms/1.0">
+    <label>Texte</label>
+</htmleditor>',
+73=>'<htmleditor ref="contenu" config="simple" xmlns="http://jelix.org/ns/forms/1.0">
-    <label>Texte</label>
-</htmleditor>',
@@ -676 +679 @@
-$ctrl->label=\'Texte\';
-$this->addControl($ctrl);',
+73=>'$ctrl= new jFormsControlhtmleditor(\'contenu\');
+$ctrl->label=\'Texte\';
+$ctrl->config=\'simple\';
+$this->addControl($ctrl);',
-);
-
@@ -1051 +1058 @@
-$js.="jForms.tForm.addControl( jForms.tControl);\n";',
-72=>'$label = \'Texte\';
+$js.="jForms.tControl = new jFormsControl(\'contenu\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\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";',
+73=>'$label = \'Texte\';
-$js.="jForms.tControl = new jFormsControl(\'contenu\', \'".str_replace("\'","\\\'",$label)."\', \'string\');\n";
-$js.="jForms.tControl.errRequired=\'".str_replace("\'","\\\'",jLocale::get(\'jelix~formserr.js.err.required\',$label))."\';\n";

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

@@ -89 +89 @@
-        $builder->outputHeader(array('','','post'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="action" value="urlsig:url1"/>
-</div><script type="text/javascript">
@@ -103 +103 @@
-        $builder->outputHeader(array('','','get'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="module" value="jelix_tests"/>
-<input type="hidden" name="action" value="urlsig:url1"/>
@@ -670 +670 @@
-        $builder->outputHeader(array('','','post'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="action" value="urlsig:url1"/>
-<input type="hidden" name="nom" id="'.$formname.'_nom" value=""/>
@@ -688 +688 @@
-        $builder->outputHeader(array('','','post'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="action" value="urlsig:url1"/>
-<input type="hidden" name="nom" id="'.$formname.'_nom" value="toto"/>
@@ -743 +743 @@
-        $this->assertEqualOrDiff('<script type="text/javascript">
-            //<![CDATA[
-simple
+default
-            //]]>
-            </script><textarea name="contenu" id="'.$this->formname.'_contenu" rows="5" cols="40">&lt;p&gt;Ceci est un contenu&lt;/p&gt;</textarea>', $out);
@@ -751 +751 @@
-        $this->assertEqualOrDiff('<script type="text/javascript">
-            //<![CDATA[
-simple
+default
-            //]]>
-            </script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" rows="5" cols="40">&lt;p&gt;Ceci est un contenu&lt;/p&gt;</textarea>', $out);
@@ -762 +762 @@
-        $this->assertEqualOrDiff('<script type="text/javascript">
-            //<![CDATA[
-simple
+default
-            //]]>
-            </script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="5" cols="40">&lt;p&gt;Ceci est un contenu&lt;/p&gt;</textarea>', $out);
@@ -770 +770 @@
-        $this->assertEqualOrDiff('<script type="text/javascript">
-            //<![CDATA[
-simple
+default
-            //]]>
-            </script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="40">&lt;p&gt;Ceci est un contenu&lt;/p&gt;</textarea>', $out);
@@ -778 +778 @@
-        $this->assertEqualOrDiff('<script type="text/javascript">
-            //<![CDATA[
-simple
+default
-            //]]>
-            </script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="60">&lt;p&gt;Ceci est un contenu&lt;/p&gt;</textarea>', $out);

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

@@ -89 +89 @@
-        $builder->outputHeader(array('','','post'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="action" value="urlsig:url1"/>
-</div><script type="text/javascript">
@@ -103 +103 @@
-        $builder->outputHeader(array('','','get'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="module" value="jelix_tests"/>
-<input type="hidden" name="action" value="urlsig:url1"/>
@@ -670 +670 @@
-        $builder->outputHeader(array('','','post'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="action" value="urlsig:url1"/>
-<input type="hidden" name="nom" id="'.$formname.'_nom" value=""/>
@@ -688 +688 @@
-        $builder->outputHeader(array('','','post'));
-        $out = ob_get_clean();
- onsubmit="return jForms.verifyForm(this)"
+
-<input type="hidden" name="action" value="urlsig:url1"/>
-<input type="hidden" name="nom" id="'.$formname.'_nom" value="toto"/>
@@ -743 +743 @@
-        $this->assertEqualOrDiff('<script type="text/javascript">