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

Merge branch '2.0' of github.com:s9y/Serendipity into 2.0

Browse Source
This commit is contained in:
Garvin Hicking
2014-05-14 12:59:42 +02:00
parent dd83225447 ac8407cd19
commit 6f0a9b7123
1 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
templates/2k11/admin/wysiwyg_init.tpl
+4 -6
View File
@@ -1,6 +1,6 @@
{if $init == false} {if $init == false}
<script src="{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor.js"></script> <script src="{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor/ckeditor.js"></script>
<script src="{$serendipityHTTPPath}htmlarea/ckeditor_custom_plugin.js"></script> <script src="{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor_custom_plugin.js"></script>
{/if} {/if}
<script> <script>
$('document').ready(function() { $('document').ready(function() {
@@ -23,9 +23,7 @@
CKEDITOR.plugins.add('{$button.id}', { CKEDITOR.plugins.add('{$button.id}', {
init: function( editor ) { init: function( editor ) {
editor.addCommand( '{$button.name}', { editor.addCommand( '{$button.name}', {
exec : function( editor ) { exec : {$button.javascript}
{$button.javascript}
}
}); });
editor.ui.addButton('{$button.id}', { editor.ui.addButton('{$button.id}', {
label: '{$button.name}', label: '{$button.name}',
@@ -39,7 +37,7 @@
CKEDITOR.replace($('#'+serendipity.escapeBrackets('{$item}')).get(0), { CKEDITOR.replace($('#'+serendipity.escapeBrackets('{$item}')).get(0), {
customConfig : '{$serendipityHTTPPath}htmlarea/ckeditor_custom_config.js', customConfig : '{$serendipityHTTPPath}htmlarea/ckeditor/ckeditor_custom_config.js',
extraPlugins : 's9y_medialibrary{$item}{foreach $buttons as $button},{$button.id}{/foreach}', extraPlugins : 's9y_medialibrary{$item}{foreach $buttons as $button},{$button.id}{/foreach}',
toolbar: [ toolbar: [