php/LuckyCoinkydink
Archived
1
0
Fork 0
Code Issues Pull Requests Activity

Fix more entry sorting

Browse Source
This commit is contained in:
Garvin Hicking
2006-08-09 07:28:41 +00:00
parent a2db8ce717
commit e06556d476
5 changed files with 15 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deployment/serendipity_editor.js
+4 -3
View File
@@ -268,7 +268,7 @@ function serendipity_imageSelector_done(textarea)
} else if (targetval == '_blank') {
itarget = ' target="_blank"';
} else if (targetval == 'plugin') {
itarget = ' id="s9yisphref' + imgID + '"';
itarget = ' id="s9yisphref' + imgID + '" onclick="javascript:this.href = this.href + \'&serendipity[from]=\' + self.location.href;"';
prepend = '<a title="' + ilink + '" id="s9yisp' + imgID + '"></a>';
ilink = baseURL + 'serendipity_admin_image_selector.php?serendipity[step]=showItem&amp;serendipity[image]=' + imgID;
}
@@ -288,10 +288,11 @@ function serendipity_imageSelector_done(textarea)
block = insert;
}
if (parent.self.opener.editorref) {
if (typeof(parent.self.opener.htmlarea_editors) != 'undefined' && typeof(parent.self.opener.htmlarea_editors[textarea] != 'undefined')) {
parent.self.opener.htmlarea_editors[textarea].surroundHTML(block, '');
} else if (parent.self.opener.editorref) {
parent.self.opener.editorref.surroundHTML(block, '');
} else {
parent.self.opener.serendipity_imageSelector_addToBody(block, textarea);
}
docs/NEWS
+4
View File
@@ -243,6 +243,10 @@ Version 1.1-alpha5()
Version 1.0.1 ()
------------------------------------------------------------------------
* Fix problem on newer Firefox versions, where insertion of images
in the WYSIWYG editor did not work. It might be necessary to
purge your browsers cache for this to properly work. (Jay Bertrandt)
* Fix utf8 iconv conversion failing on some older PHP setups.
Thanks to Matthias Leisi!
include/admin/images.inc.php
+3 -1
View File
@@ -515,6 +515,7 @@ switch ($serendipity['GET']['adminAction']) {
NULL,
'write'
);
usort($folders, 'serendipity_sortPath');
?>
<div class="image_directory_create"><strong><?php echo CREATE_DIRECTORY ?></strong></div>
<div class="image_directory_create_desc"><?php echo CREATE_DIRECTORY_DESC ?></div>
@@ -557,7 +558,7 @@ switch ($serendipity['GET']['adminAction']) {
NULL,
'write'
);
usort($folders, 'serendipity_sortPath');
?>
<div class="image_directory_list"><?php echo DIRECTORIES_AVAILABLE; ?></div>
<br />
@@ -594,6 +595,7 @@ switch ($serendipity['GET']['adminAction']) {
NULL,
'write'
);
usort($folders, 'serendipity_sortPath');
$form_hidden = '';
if (isset($image_selector_addvars) && is_array($image_selector_addvars)) {
include/functions_entries_admin.inc.php
+1 -1
View File
@@ -532,7 +532,7 @@ function serendipity_emit_htmlarea_code($item, $jsname, $spawnMulti = false) {
config<?php echo $jsname; ?> = editor<?php echo $jsname; ?>.config;
config<?php echo $jsname; ?>.registerButton('image_selector', '<?PHP echo MANAGE_IMAGES; ?>', '<?php echo $serendipity['serendipityHTTPPath']; ?>htmlarea/images/ed_s9yimage.gif', false,
function(editor, id) {
window.open('<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin_image_selector.php?serendipity[textarea]=<?php echo $jsname; ?>', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
window.open('<?php echo $serendipity['serendipityHTTPPath']; ?>serendipity_admin_image_selector.php?serendipity[textarea]=<?php echo $jsname . ($spawnMulti ? "' + editor._textArea.id + '" : ''); ?>', 'ImageSel', 'width=800,height=600,toolbar=no,scrollbars=1,scrollbars,resize=1,resizable=1');
editorref = editor<?php echo $jsname; ?>;
}
);
serendipity_editor.js
+3 -2
View File
@@ -288,10 +288,11 @@ function serendipity_imageSelector_done(textarea)
block = insert;
}
if (parent.self.opener.editorref) {
if (typeof(parent.self.opener.htmlarea_editors) != 'undefined' && typeof(parent.self.opener.htmlarea_editors[textarea] != 'undefined')) {
parent.self.opener.htmlarea_editors[textarea].surroundHTML(block, '');
} else if (parent.self.opener.editorref) {
parent.self.opener.editorref.surroundHTML(block, '');
} else {
parent.self.opener.serendipity_imageSelector_addToBody(block, textarea);
}