Update of /cvsroot/php-blog/serendipity/deployment
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14208/deployment
Modified Files:
serendipity_editor.js
Log Message:
fix image comment display
Index: serendipity_editor.js
===================================================================
RCS file: /cvsroot/php-blog/serendipity/deployment/serendipity_editor.js,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- serendipity_editor.js 4 May 2004 08:57:38 -0000 1.4
+++ serendipity_editor.js 12 May 2004 14:35:29 -0000 1.5
@@ -142,9 +142,13 @@
var f = document.forms['serendipity[selForm]'].elements;
if (f['serendipity[linkThumbnail]'][0].checked == true) {
- img = f['thumbName'].value;
+ img = f['thumbName'].value;
+ imgWidth = f['imgThumbWidth'].value;
+ imgHeight = f['imgThumbHeight'].value;
} else {
- img = f['imgName'].value;
+ img = f['imgName'].value;
+ imgWidth = f['imgWidth'].value;
+ imgHeight = f['imgHeight'].value;
}
if (f['serendipity[filename_only]'] && f['serendipity[filename_only]'].value == 'true') {
@@ -162,22 +166,22 @@
floating = 'center';
if (XHTML11) {
if (f['serendipity[align]'][0].checked == true) {
- img = "<img " + (styled ? 'style="border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+ img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
} else if (f['serendipity[align]'][1].checked == true) {
- img = "<img " + (styled ? 'style="float: left; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+ img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="float: left; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
floating = 'left';
} else if (f['serendipity[align]'][2].checked == true) {
- img = "<img " + (styled ? 'style="float: right; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />\n";
+ img = "<img width='" + imgWidth + "' height='" + imgHeight + "' " + (styled ? 'style="float: right; border: 0px; padding-left: 5px; padding-right: 5px;"' : '') + ' src="' + img + "\" alt=\"\" />";
floating = 'right';
}
} else {
if (f['serendipity[align]'][0].checked == true) {
- img = "<img border='0' hspace='5' src='" + img + "' alt='' />\n";
+ img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' src='" + img + "' alt='' />";
} else if (f['serendipity[align]'][1].checked == true) {
- img = "<img border='0' hspace='5' align='left' src='" + img + "' alt='' />";
+ img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' align='left' src='" + img + "' alt='' />";
floating = 'left';
} else if (f['serendipity[align]'][2].checked == true) {
- img = "<img border='0' hspace='5' align='right' src='" + img + "' alt='' />";
+ img = "<img width='" + imgWidth + "' height='" + imgHeight + "' border='0' hspace='5' align='right' src='" + img + "' alt='' />";
floating = 'right';
}
}
@@ -190,10 +194,12 @@
if (document.getElementById('serendipity_imagecomment').value != '') {
comment = f['serendipity[imagecomment]'].value;
- block = '<div class="serendipity_imageComment_' + floating + '">'
+ block = '<div class="serendipity_imageComment_' + floating + '" style="width: ' + imgWidth + 'px">'
+ '<div class="serendipity_imageComment_img">' + insert + '</div>'
+ '<div class="serendipity_imageComment_txt">' + comment.replace("\n", "<br />\n") + '</div>'
- + '</div>';
+ + '</div>'
+ + '<span class="serendipity_imageCommentClosing_' + floating + '"><span></span></span>';
+
} else {
block = insert;
}
|
