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

fixes nasty media insert target bug

Browse Source 
Fixes #143 and Fixes #145 and References #121
This commit is contained in:
Ian
2014-05-24 11:46:58 +02:00
parent 4c965bd2d5
commit 62026e5ba3
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
docs/NEWS
View File

@ -4,6 +4,8 @@
Version 2.0-beta3 () Version 2.0-beta3 ()
------------------------------------------------------------------------ ------------------------------------------------------------------------
* Fixed media insert target bug (issued by #143, #145, #121)
* All frontend themes that rely on the bundled Core jQuery library * All frontend themes that rely on the bundled Core jQuery library
are currently using the jquery.noConflict-mode for compatibility are currently using the jquery.noConflict-mode for compatibility
to older plugins. to older plugins.

14
templates/2k11/admin/media_choose.tpl
View File

@ -90,7 +90,7 @@ if (parent.frames && parent.frames['tree']) {
{if $media.file.fast_select} {if $media.file.fast_select}
<script> <script>
{serendipity_hookPlugin hookAll=true hook='frontend_image_add_filenameonly' eventData=$media.file} {serendipity_hookPlugin hookAll=true hook='frontend_image_add_filenameonly' eventData=$media.file}
serendipity_imageSelector_done('{$media.textarea|@escape}'); serendipity.serendipity_imageSelector_done('{$media.textarea|@escape}');
</script> </script>
{else} {else}
<fieldset id="image_size"> <fieldset id="image_size">
@ -137,13 +137,13 @@ if (parent.frames && parent.frames['tree']) {
<div class="clearfix"> <div class="clearfix">
<div class="form_radio"> <div class="form_radio">
<input id="radio_islink_yes" name="serendipity[isLink]" type="radio" value="yes" {'isLink'|@ifRemember:'yes':true}> <input id="radio_islink_no" name="serendipity[isLink]" type="radio" value="no" {'isLink'|@ifRemember:'no':true}>
<label for="radio_islink_yes">{$CONST.I_WANT_NO_LINK}</label> <label for="radio_islink_no">{$CONST.I_WANT_NO_LINK}</label>
</div> </div>
<div class="form_radio"> <div class="form_radio">
<input id="radio_islink_no" name="serendipity[isLink]" type="radio" value="no" {'isLink'|@ifRemember:'no'}> <input id="radio_islink_yes" name="serendipity[isLink]" type="radio" value="yes" {'isLink'|@ifRemember:'yes'}>
<label for="radio_islink_no">{$CONST.I_WANT_IT_TO_LINK}</label> <label for="radio_islink_yes">{$CONST.I_WANT_IT_TO_LINK}</label>
<div class="form_field"> <div class="form_field">
{* Could use input[type=url], but does that handle local URLs as well? Hm. *} {* Could use input[type=url], but does that handle local URLs as well? Hm. *}
@ -159,7 +159,6 @@ if (parent.frames && parent.frames['tree']) {
</div> </div>
<div class="form_select"> <div class="form_select">
<label id="select_image_target">{$CONST.MEDIA_TARGET}</label>
<select id="select_image_target" name="serendipity[target]"> <select id="select_image_target" name="serendipity[target]">
<option value="none" {'target'|@ifRemember:'none':false:'selected'}>{$CONST.NONE}</option> <option value="none" {'target'|@ifRemember:'none':false:'selected'}>{$CONST.NONE}</option>
<option value="js" {'target'|@ifRemember:'js':false:'selected'}>{$CONST.MEDIA_TARGET_JS}</option> <option value="js" {'target'|@ifRemember:'js':false:'selected'}>{$CONST.MEDIA_TARGET_JS}</option>
@ -167,6 +166,7 @@ if (parent.frames && parent.frames['tree']) {
<option value="_blank" {'target'|@ifRemember:'_blank':false:'selected'}>{$CONST.MEDIA_TARGET_BLANK}</option> <option value="_blank" {'target'|@ifRemember:'_blank':false:'selected'}>{$CONST.MEDIA_TARGET_BLANK}</option>
</select> </select>
{serendipity_hookPlugin hookAll=true hook='frontend_image_selector_imagelink2' eventData=$media.file} {serendipity_hookPlugin hookAll=true hook='frontend_image_selector_imagelink2' eventData=$media.file}
<label for="select_image_target">{$CONST.MEDIA_TARGET}</label>
</div> </div>
</fieldset> </fieldset>
@ -200,7 +200,7 @@ if (parent.frames && parent.frames['tree']) {
{if $media.filename_only} {if $media.filename_only}
<script> <script>
{serendipity_hookPlugin hookAll=true hook='frontend_image_add_filenameonly' eventData=$media} {serendipity_hookPlugin hookAll=true hook='frontend_image_add_filenameonly' eventData=$media}
parent.self.opener.serendipity_imageSelector_addToElement('{$media.file.full_file|escape}', '{$media.htmltarget|@escape}'); parent.self.opener.serendipity.serendipity_imageSelector_addToElement('{$media.file.full_file|escape}', '{$media.htmltarget|@escape}');
parent.self.close(); parent.self.close();
</script> </script>
{else} {else}