Changeset 430:dbecec9a2ede for admin/js

Timestamp:

06/28/11 10:53:33 (14 years ago)

Author:

Tomtom33 <tbouron@…>

Branch:

wysiwyg

Message:

Fixed various bugs

Location:

admin/js

Files:

• dcToolBar.js (modified) (1 diff)
• tiny_mce/plugins/dcControls/editor_plugin.js (modified) (1 diff)

admin/js/dcToolBar.js

@@ -13 +13 @@
                }
                
+               tinymce.addI18n(dcToolBar.getI18n());
+               
                return this.each(function(){
                     $.data(this,'toolbar',new tinymce.Editor($(this).attr('id'),dcToolBar.getConfig(settings.formatter)));
                     $(this).data('toolbar').activeFormatter = settings.formatter;
-                    $(this).data('toolbar').onPreInit.add(function(ed) {
-                         tinymce.addI18n(dcToolBar.getI18n());
-                    });
                });
           

admin/js/tiny_mce/plugins/dcControls/editor_plugin.js

@@ -26 +26 @@
                     var url = popup_link_url;
                     var node = ed.dom.getParent(se.getNode(), 'A');
+                    
+                    if (node == null) {
+                         node = se.getNode();
+                    }
                     
                     if (node.nodeName == 'A') {