tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 12:05:37 +00:00
Code Issues Projects Releases Wiki Activity

BUGFIX: merge r92502 from trunk for HtmlEditorConfig.php, merge r93934 from trunk for HtmlEditorField.js, merge r92500 from trunk for sapphire/thirdpart/tinymce-advcode/editor_plugin_src.js, aiming to solve the conflict of folder name tinymce-advcode.

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/branches/2.4@93935 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Normann Lou 2009-11-30 00:28:21 +00:00 committed by Sam Minnee
parent 6104d33f9d
commit 433af2515c
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
forms/HtmlEditorConfig.php
View File

@ -78,14 +78,15 @@ class HtmlEditorConfig {
'safari_warning' => false, 'safari_warning' => false,
'relative_urls' => true, 'relative_urls' => true,
'verify_html' => true 'verify_html' => true,
); );
/** /**
* Holder list of enabled plugins * Holder list of enabled plugins
*/ */
protected $plugins = array( protected $plugins = array(
'contextmenu', 'table', 'emotions', 'paste', '../../tinymce_advcode', 'spellchecker' 'contextmenu', 'table', 'emotions', 'paste', '../../tinymce-advcode', 'spellchecker'
); );
/** /**

2
javascript/HtmlEditorField.js
View File

@ -13,7 +13,7 @@ if((typeof tinyMCE != 'undefined')) {
theme_advanced_toolbar_location : "top", theme_advanced_toolbar_location : "top",
theme_advanced_toolbar_align : "left", theme_advanced_toolbar_align : "left",
theme_advanced_toolbar_parent : "right", theme_advanced_toolbar_parent : "right",
plugins : "contextmenu,table,emotions,paste,../../tinymce_advcode,spellchecker", plugins : "contextmenu,table,emotions,paste,../../tinymce-advcode,spellchecker",
blockquote_clear_tag : "p", blockquote_clear_tag : "p",
table_inline_editing : true, table_inline_editing : true,
theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,formatselect,separator,bullist,numlist,outdent,indent,blockquote,hr,charmap", theme_advanced_buttons1 : "bold,italic,underline,strikethrough,separator,justifyleft,justifycenter,justifyright,justifyfull,formatselect,separator,bullist,numlist,outdent,indent,blockquote,hr,charmap",

7
thirdparty/tinymce-advcode/editor_plugin_src.js vendored
View File

@ -1,5 +1,6 @@
(function() { (function() {
tinymce.PluginManager.requireLangPack('../../tinymce_advcode'); tinymce.PluginManager.requireLangPack('advcode');
tinymce.create('tinymce.plugins.AdvancedCodePlugin', { tinymce.create('tinymce.plugins.AdvancedCodePlugin', {
init : function(ed, url) { init : function(ed, url) {
// Register commands // Register commands
@ -29,12 +30,12 @@
longname : 'Advanced Code Editor', longname : 'Advanced Code Editor',
author : 'Daniel Insley', author : 'Daniel Insley',
authorurl : 'http://www.danielinsley.com', authorurl : 'http://www.danielinsley.com',
infourl : 'http://www.danielinsley.com/2008/1/14/tinymce-syntax-highlighted-code-editor', infourl : 'http://github.com/dinsley/tinymce-codepress/tree/master',
version : tinymce.majorVersion + "." + tinymce.minorVersion version : tinymce.majorVersion + "." + tinymce.minorVersion
}; };
} }
}); });
// Register plugin // Register plugin
tinymce.PluginManager.add('../../tinymce_advcode', tinymce.plugins.AdvancedCodePlugin); tinymce.PluginManager.add('advcode', tinymce.plugins.AdvancedCodePlugin);
})(); })();