fix for enablePopup mode

This commit is contained in:
Ian 2014-06-10 10:24:10 +02:00
parent 2086678378
commit 41049274ab
4 changed files with 14 additions and 3 deletions

View file

@ -1,3 +1,7 @@
1.5:
----
* Fix for enablePopup in >= 2.0
1.4:
----
* Adapted backend markup for 2.0 backend.

View file

@ -44,7 +44,7 @@
<h3>{$CONST.PLUGIN_LINKTRIMMER_NAME}</h3>
{/if}
<form action="?" method="post">
<input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|escape:url}">
<input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|escape:'url'}">
<fieldset id="main_linktrimmer" class="">
{if $linktrimmer_external}
<legend>{$CONST.PLUGIN_LINKTRIMMER_NAME}</legend>
@ -70,8 +70,13 @@
{if $linktrimmer_url != '' && $linktrimmer_external}
<script>
{if !$linktrimmer_ispopup}
window.parent.parent.serendipity.serendipity_imageSelector_addToBody('<a href="{$linktrimmer_url|escape}" title="{$linktrimmer_origurl|escape}">{$linktrimmer_origurl|escape}</a>', '{$linktrimmer_txtarea|escape}');
window.parent.parent.$.magnificPopup.close();
{else}
self.opener.serendipity_imageSelector_addToBody('<a href="{$linktrimmer_url|escape}" title="{$linktrimmer_origurl|escape}">{$linktrimmer_origurl|escape}</a>', '{$linktrimmer_txtarea|escape}');
self.close();
{/if}
</script>
{elseif $linktrimmer_url != ''}
<div class="form_field">

View file

@ -22,7 +22,7 @@
<div class="linktrimmer">
<form action="?" method="post">
<input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|@escape:url}" />
<input type="hidden" name="txtarea" value="{$linktrimmer_txtarea|@escape:'url'}" />
<fieldset>
<legend>{$CONST.PLUGIN_LINKTRIMMER_NAME}</legend>

View file

@ -26,7 +26,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
'php' => '4.1.0'
));
$propbag->add('version', '1.4');
$propbag->add('version', '1.5');
$propbag->add('author', 'Garvin Hicking, Ian');
$propbag->add('stackable', false);
$propbag->add('configuration', array('prefix', 'frontpage', 'domain'));
@ -202,6 +202,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
}
$serendipity['smarty']->assign(array(
'linktrimmer_ispopup' => $serendipity['enablePopup'],
'linktrimmer_error' => $error,
'linktrimmer_url' => $url,
'linktrimmer_origurl' => $_REQUEST['linktrimmer_url'],
@ -347,6 +348,7 @@ class serendipity_event_linktrimmer extends serendipity_event {
$_REQUEST[$val[0]] = $val[1];
}
}
switch($uri_part) {
case 'plugin_linktrimmer.gif':
header('Content-Type: image/gif');