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

Merge pull request #333 from halkyon/master

Browse Source 
Fixing media and link popups not opening in HtmlEditorField
This commit is contained in:
Sean Harvey 2012-04-16 20:18:10 -07:00
commit 2ffb6adb5b
2 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
thirdparty/tinymce_ssbuttons/editor_plugin_src.js vendored
View File

@ -31,12 +31,12 @@
ed.addButton('sslink', {title : ed.getLang('tinymce_ssbuttons.insertlink'), cmd : 'sslink', 'class' : 'mce_link'});
ed.addButton('ssimage', {title : ed.getLang('tinymce_ssbuttons.insertimage'), cmd : 'ssimage', 'class' : 'mce_image'});
ed.addCommand("sslink", function(ed) {
jQuery('#Form_EditorToolbarLinkForm').entwine('ss').open();
ed.addCommand('sslink', function(ed) {
jQuery('#' + this.id).entwine('ss').openLinkDialog();
});
ed.addCommand("ssimage", function(ed) {
jQuery('#Form_EditorToolbarMediaForm').entwine('ss').open();
ed.addCommand('ssimage', function(ed) {
jQuery('#' + this.id).entwine('ss').openMediaDialog();
});
// Disable link button when no link is selected
@ -49,4 +49,4 @@
// Adds the plugin class to the list of available TinyMCE plugins
tinymce.PluginManager.add("ssbuttons", tinymce.plugins.SSButtons);
})();
})();

17
thirdparty/tinymce_ssmacron/editor_plugin_src.js vendored
View File

@ -19,8 +19,8 @@
init : function(ed, url) {
// Register commands
ed.addCommand('mceInsertMacron', function() {
// Register commands
ed.addCommand('mceInsertMacron', function() {
ed.windowManager.open({
file : url + '/macron.htm',
width : 350 + parseInt(ed.getLang('advanced.charmap_delta_width', 0)),
@ -31,13 +31,12 @@
});
});
// Register buttons
ed.addButton('ssmacron', {
title : 'Insert a Macron',
cmd : 'mceInsertMacron',
image : url + '/img/macron.png'
});
// Register buttons
ed.addButton('ssmacron', {
title : 'Insert a Macron',
cmd : 'mceInsertMacron',
image : url + '/img/macron.png'
});
}
});