Permalink
Browse files

ENHANCEMENT Removed tinymce_ssbuttons code which assumed a non-modal …

…dialog (toggling between different link/image/flash forms)
  • Loading branch information...
1 parent bc88a44 commit 766adba5ad324df1d06f8f06e3f502f4242d4d83 @chillu chillu committed Apr 5, 2011
Showing with 7 additions and 67 deletions.
  1. +7 −67 javascript/tinymce_ssbuttons/editor_plugin_src.js
@@ -22,86 +22,26 @@
init : function(ed, url) {
- /**
- * These map the action buttons to the IDs of the forms that they open/close
- */
- forms = {
- 'sslink' : 'Form_EditorToolbarLinkForm',
- 'ssimage' : 'Form_EditorToolbarImageForm',
- 'ssflash' : 'Form_EditorToolbarFlashForm'
- };
-
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.addButton('ssflash', {title : ed.getLang('tinymce_ssbuttons.insertflash'), cmd : 'ssflash', 'class' : 'mce_flash', 'image': url + '/img/flash.gif'});
- /**
- * Show a side panel, hiding others
- * If showCommand isn't set, then this will simply hide panels
- */
- function showSidePanel(showCommand, hideCommands) {
- ed.ss_focus_bookmark = ed.selection.getBookmark();
- hideCommands.each(function(command) {
- ed.controlManager.setActive(command,false);
- Element.hide(forms[command]);
- });
-
- var showForm = null;
- if(forms[showCommand]) {
- showForm = $(forms[showCommand]);
- showForm.toggle(ed);
- }
-
- if(!showForm || showForm.style.display == "none") {
- ed.controlManager.setActive(showCommand, false);
- // Can't use $('contentPanel'), as its in a different window
- jQuery('#contentPanel', window.parent).hide();
- } else {
- ed.controlManager.setActive(showCommand, true);
- jQuery('#contentPanel', window.parent).show();
- }
- }
-
- ed.addCommand("ssclosesidepanel", function(ed) {
- showSidePanel('', [ 'sslink', 'ssimage', 'ssflash' ]);
- });
-
ed.addCommand("sslink", function(ed) {
- showSidePanel('sslink', [ 'ssimage', 'ssflash' ]);
+ jQuery('#Form_EditorToolbarLinkForm')[0].open();
});
ed.addCommand("ssimage", function(ed) {
- showSidePanel('ssimage', [ 'sslink', 'ssflash' ]);
+ jQuery('#Form_EditorToolbarImageForm')[0].open();
});
ed.addCommand("ssflash", function(ed) {
- showSidePanel('ssflash', [ 'ssimage', 'sslink' ]);
+ jQuery('#Form_EditorToolbarFlashForm')[0].open();
});
-
+
ed.onNodeChange.add(function(ed, o) {
- //$('Form_EditorToolbarLinkForm').updateSelection(ed);
- //$('Form_EditorToolbarLinkForm').respondToNodeChange(ed);
- });
- ed.onKeyUp.add(function(ed, o) {
- //$('Form_EditorToolbarLinkForm').updateSelection(ed);
- });
-
- // resize image containers when the image is resized.
- if(!tinymce.isOpera && !tinymce.isWebKit) ed.onMouseUp.add(function(ed, o) {
- var node = ed.selection.getNode();
- if(node.nodeName == 'IMG' && ed.dom.getParent(node, 'div')) {
- // we have to delay the resize check here, as this event handler is called before the actual image
- // resizing is done.
- setTimeout(function() {
- var ed = tinyMCE.activeEditor, // we need to redeclare these for IE.
- node = ed.selection.getNode(),
- container = ed.dom.getParent(node, 'div');
-
- if(node.width && node.width != parseInt(ed.dom.getStyle(container, 'width'))) {
- ed.dom.setStyle(container, 'width', parseInt(node.width));
- ed.execCommand('mceRepaint');
- }
- }, 1);
+ if ($('Form_EditorToolbarLinkForm').updateSelection) {
+ $('Form_EditorToolbarLinkForm').updateSelection(ed);
+ $('Form_EditorToolbarLinkForm').respondToNodeChange(ed);
}
});
}

0 comments on commit 766adba

Please sign in to comment.