Changeset 863

Timestamp:

04/04/08 23:59:07 (8 months ago)

Author:

laurentj

Message:

fixed bug: content of htmleditor was not send with other datas

Files:

trunk/lib/jelix-www/wymeditor/config/default.js (modified) (1 diff)
trunk/lib/jelix-www/wymeditor/config/default.js (modified) (1 diff)
trunk/lib/jelix-www/wymeditor/config/default.js (modified) (1 diff)
trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (1 diff)
trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (1 diff)
trunk/lib/jelix/plugins/jforms/html/html.jformsbuilder.php (modified) (1 diff)
trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (5 diffs)
trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (5 diffs)
trunk/testapp/modules/jelix_tests/tests/jforms.htmlbuilder.html_cli.php (modified) (5 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

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

r862	r863
1	1
2		function jelix_wymeditor_default(id) {
	2	function jelix_wymeditor_default(textarea_id, form_id) {
3	3
4	4	jQuery(function() {
5		jQuery("#"+id).wymeditor();
	5	jQuery("#"+textarea_id).wymeditor({
	6	updateSelector: "#"+form_id,
	7	updateEvent: "submit"
	8	});
6	9	});
7	10

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

r862	r863
1	1
2		function jelix_wymeditor_default(id) {
	2	function jelix_wymeditor_default(textarea_id, form_id) {
3	3
4	4	jQuery(function() {
5		jQuery("#"+id).wymeditor();
	5	jQuery("#"+textarea_id).wymeditor({
	6	updateSelector: "#"+form_id,
	7	updateEvent: "submit"
	8	});
6	9	});
7	10

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

r862	r863
1	1
2		function jelix_wymeditor_default(id) {
	2	function jelix_wymeditor_default(textarea_id, form_id) {
3	3
4	4	jQuery(function() {
5		jQuery("#"+id).wymeditor();
	5	jQuery("#"+textarea_id).wymeditor({
	6	updateSelector: "#"+form_id,
	7	updateEvent: "submit"
	8	});
6	9	});
7	10

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

r862	r863
217	217	echo '<script type="text/javascript">
218	218	//<![CDATA[
219		jelix_',$engine,'_',$ctrl->config.'("',$this->_name,'_',$ctrl->ref,'");
	219	jelix_',$engine,'_',$ctrl->config.'("',$this->_name,'_',$ctrl->ref,'","',$this->_name,'");
220	220	//]]>
221	221	</script>';

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

r862	r863
217	217	echo '<script type="text/javascript">
218	218	//<![CDATA[
219		jelix_',$engine,'_',$ctrl->config.'("',$this->_name,'_',$ctrl->ref,'");
	219	jelix_',$engine,'_',$ctrl->config.'("',$this->_name,'_',$ctrl->ref,'","',$this->_name,'");
220	220	//]]>
221	221	</script>';

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

r862	r863
217	217	echo '<script type="text/javascript">
218	218	//<![CDATA[
219		jelix_',$engine,'_',$ctrl->config.'("',$this->_name,'_',$ctrl->ref,'");
	219	jelix_',$engine,'_',$ctrl->config.'("',$this->_name,'_',$ctrl->ref,'","',$this->_name,'");
220	220	//]]>
221	221	</script>';

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

r862	r863
743	743	$this->assertEqualOrDiff('<script type="text/javascript">
744	744	//<![CDATA[
745		jelix_wymeditor_default("'.$this->formname.'_contenu");
	745	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
746	746	//]]>
747	747	</script><textarea name="contenu" id="'.$this->formname.'_contenu" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
751	751	$this->assertEqualOrDiff('<script type="text/javascript">
752	752	//<![CDATA[
753		jelix_wymeditor_default("'.$this->formname.'_contenu");
	753	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
754	754	//]]>
755	755	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
762	762	$this->assertEqualOrDiff('<script type="text/javascript">
763	763	//<![CDATA[
764		jelix_wymeditor_default("'.$this->formname.'_contenu");
	764	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
765	765	//]]>
766	766	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
770	770	$this->assertEqualOrDiff('<script type="text/javascript">
771	771	//<![CDATA[
772		jelix_wymeditor_default("'.$this->formname.'_contenu");
	772	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
773	773	//]]>
774	774	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
778	778	$this->assertEqualOrDiff('<script type="text/javascript">
779	779	//<![CDATA[
780		jelix_wymeditor_default("'.$this->formname.'_contenu");
	780	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
781	781	//]]>
782	782	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="60"><p>Ceci est un contenu</p></textarea>', $out);

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

r862	r863
743	743	$this->assertEqualOrDiff('<script type="text/javascript">
744	744	//<![CDATA[
745		jelix_wymeditor_default("'.$this->formname.'_contenu");
	745	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
746	746	//]]>
747	747	</script><textarea name="contenu" id="'.$this->formname.'_contenu" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
751	751	$this->assertEqualOrDiff('<script type="text/javascript">
752	752	//<![CDATA[
753		jelix_wymeditor_default("'.$this->formname.'_contenu");
	753	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
754	754	//]]>
755	755	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
762	762	$this->assertEqualOrDiff('<script type="text/javascript">
763	763	//<![CDATA[
764		jelix_wymeditor_default("'.$this->formname.'_contenu");
	764	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
765	765	//]]>
766	766	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
770	770	$this->assertEqualOrDiff('<script type="text/javascript">
771	771	//<![CDATA[
772		jelix_wymeditor_default("'.$this->formname.'_contenu");
	772	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
773	773	//]]>
774	774	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
778	778	$this->assertEqualOrDiff('<script type="text/javascript">
779	779	//<![CDATA[
780		jelix_wymeditor_default("'.$this->formname.'_contenu");
	780	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
781	781	//]]>
782	782	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="60"><p>Ceci est un contenu</p></textarea>', $out);

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

r862	r863
743	743	$this->assertEqualOrDiff('<script type="text/javascript">
744	744	//<![CDATA[
745		jelix_wymeditor_default("'.$this->formname.'_contenu");
	745	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
746	746	//]]>
747	747	</script><textarea name="contenu" id="'.$this->formname.'_contenu" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
751	751	$this->assertEqualOrDiff('<script type="text/javascript">
752	752	//<![CDATA[
753		jelix_wymeditor_default("'.$this->formname.'_contenu");
	753	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
754	754	//]]>
755	755	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
762	762	$this->assertEqualOrDiff('<script type="text/javascript">
763	763	//<![CDATA[
764		jelix_wymeditor_default("'.$this->formname.'_contenu");
	764	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
765	765	//]]>
766	766	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="5" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
770	770	$this->assertEqualOrDiff('<script type="text/javascript">
771	771	//<![CDATA[
772		jelix_wymeditor_default("'.$this->formname.'_contenu");
	772	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
773	773	//]]>
774	774	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="40"><p>Ceci est un contenu</p></textarea>', $out);
…	…
778	778	$this->assertEqualOrDiff('<script type="text/javascript">
779	779	//<![CDATA[
780		jelix_wymeditor_default("'.$this->formname.'_contenu");
	780	jelix_wymeditor_default("'.$this->formname.'_contenu","jform1");
781	781	//]]>
782	782	</script><textarea name="contenu" id="'.$this->formname.'_contenu" readonly="readonly" title="ceci est un tooltip" rows="20" cols="60"><p>Ceci est un contenu</p></textarea>', $out);

Download in other formats: Unified Diff Zip Archive

Developers' Corner

Changeset 863

Legend: