tonyair/silverstripe-reports
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-reports synced 2024-10-22 11:05:53 +02:00
Code Issues Projects Releases Wiki Activity

MINOR Bugfixes for SWFUpload

Browse Source 
git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/cms/trunk@92853 467b73ca-7a2a-4603-9d3b-597d59a354a9
This commit is contained in:
Ingo Schommer 2009-11-21 03:21:19 +00:00
parent 394e0c0b38
commit e3a51fe6b9
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_config.php
View File

@ -42,7 +42,7 @@ HtmlEditorConfig::get('cms')->setOptions(array(
)); ));
HtmlEditorConfig::get('cms')->enablePlugins('media', '../../tinymce_ssbuttons', 'fullscreen'); HtmlEditorConfig::get('cms')->enablePlugins('media', '../../../../cms/javascript/tinymce_ssbuttons', 'fullscreen');
HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect'); HtmlEditorConfig::get('cms')->insertButtonsBefore('formatselect', 'styleselect');
HtmlEditorConfig::get('cms')->insertButtonsBefore('advcode', 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator' ); HtmlEditorConfig::get('cms')->insertButtonsBefore('advcode', 'ssimage', 'ssflash', 'sslink', 'unlink', 'anchor', 'separator' );

1
code/LeftAndMain.php
View File

@ -275,7 +275,6 @@ class LeftAndMain extends Controller {
'sapphire/thirdparty/scriptaculous/controls.js', 'sapphire/thirdparty/scriptaculous/controls.js',
'cms/javascript/LeftAndMain.js', 'cms/javascript/LeftAndMain.js',
'sapphire/javascript/tree/tree.js', 'sapphire/javascript/tree/tree.js',
'cms/javascript/TinyMCEImageEnhancement.js',
'sapphire/thirdparty/swfupload/swfupload/swfupload.js', 'sapphire/thirdparty/swfupload/swfupload/swfupload.js',
'cms/javascript/Upload.js', 'cms/javascript/Upload.js',
'cms/javascript/TinyMCEImageEnhancement.js', 'cms/javascript/TinyMCEImageEnhancement.js',

6
javascript/TinyMCEImageEnhancement.js
View File

@ -218,4 +218,8 @@ TinyMCEImageEnhancement.prototype = {
return $('Form_EditorToolbarImageForm_FolderID').value == '' ? 'root' : $('Form_EditorToolbarImageForm_FolderID').value; return $('Form_EditorToolbarImageForm_FolderID').value == '' ? 'root' : $('Form_EditorToolbarImageForm_FolderID').value;
} }
} }
tinyMCEImageEnhancement = new TinyMCEImageEnhancement(); var tinyMCEImageEnhancement;
jQuery(function() {
tinyMCEImageEnhancement = new TinyMCEImageEnhancement();
});

2
javascript/Upload.js
View File

@ -74,7 +74,7 @@ Upload.prototype = {
button_window_mode : "transparent", button_window_mode : "transparent",
button_width : this.buttonWidth, button_width : this.buttonWidth,
button_height : this.buttonHeight, button_height : this.buttonHeight,
flash_url : 'sapphire/thirdparty/swfupload/swfupload/swfupload.swf', // Relative to this file flash_url : 'sapphire/thirdparty/swfupload/swfupload/swfupload.swf',
swfupload_loaded_handler: this.buildUI.bind(this), swfupload_loaded_handler: this.buildUI.bind(this),
debug: false, debug: false,
preserve_relative_urls: true preserve_relative_urls: true