emo 2.11 - move to frontend footer

This commit is contained in:
Ian 2014-11-13 19:00:17 +01:00
parent e39ece15b2
commit 6e5e4a242b
2 changed files with 27 additions and 5 deletions

View file

@ -1,3 +1,11 @@
2.11:
-----
move script to frontend_footer
2.10:
-----
better cursor position detection References #185
2.9.1:
----
fixed language attribute on the script element is obsolete

View file

@ -1,5 +1,4 @@
<?php #
<?php
if (IN_serendipity !== true) {
die ("Don't hack!");
@ -30,13 +29,13 @@ class serendipity_event_emoticonchooser extends serendipity_event
'smarty' => '2.6.7',
'php' => '4.1.0'
));
$propbag->add('version', '2.10');
$propbag->add('version', '2.11');
$propbag->add('event_hooks', array(
'backend_entry_toolbar_extended' => true,
'backend_entry_toolbar_body' => true,
'frontend_comment' => true,
'backend_header' => true,
'frontend_header' => true,
'frontend_footer' => true,
'css_backend' => true
));
$propbag->add('groups', array('BACKEND_EDITOR'));
@ -178,6 +177,8 @@ class serendipity_event_emoticonchooser extends serendipity_event
}
$unique[$value] = $key;
}
// script include has to stick to to backend_header, while using inline onclick (see above)
if (IN_serendipity_admin === true) {
?>
<div class="serendipity_emoticon_bar">
<script type="text/javascript">
@ -185,6 +186,19 @@ class serendipity_event_emoticonchooser extends serendipity_event
</script>
<?php
} else { // in frontend footer
?>
<div class="serendipity_emoticon_bar">
<script type="text/javascript">
document.onreadystatechange = function () {
if (document.readyState == "interactive") {
emoticonchooser('<?php echo $func; ?>', '<?php echo $txtarea; ?>', '<?php echo $cke_txtarea; ?>');
}
}
</script>
<?php
}
echo $popuplink."\n";
echo ' <div id="serendipity_emoticonchooser_' . $func . '" style="' . $style . $popupstyle . '">'."\n";
foreach($unique as $value => $key) {
@ -200,7 +214,7 @@ class serendipity_event_emoticonchooser extends serendipity_event
break;
case 'backend_header':
case 'frontend_header':
case 'frontend_footer':
?>
<script type="text/javascript" src="<?php echo $serendipity['serendipityHTTPPath'] . 'plugins/serendipity_event_emoticonchooser/emoticonchooser.js'; ?>"></script>
<?php