Ticket #6860: 6860.patch

_source/plugins/placeholder/dialogs/placeholder.js

@@ -48 +48 @@
                         onShow : function()
                         {
                                 if ( isEdit )
-                                {
-                                        var range = editor.getSelection().getRanges()[0];
-                                        range.shrink( CKEDITOR.SHRINK_TEXT );
-                                        var node = range.startContainer;
-                                        while( node && !( node.type == CKEDITOR.NODE_ELEMENT && node.data( 'cke-placeholder' ) ) )
-                                                node = node.getParent();
-                                        this._element = node;
-                                }
+                                        this._element = CKEDITOR.plugins.placeholder.getSelectedPlaceHoder( editor );
 
                                 this.setupContent( this._element );
                         },

_source/plugins/placeholder/plugin.js

@@ -58 +58 @@
 
                         editor.on( 'doubleclick', function( evt )
                                 {
-                                        var element = evt.data.element;
-                                        if ( element.data( 'cke-placeholder' ) )
+                                        if ( CKEDITOR.plugins.placeholder.getSelectedPlaceHoder( editor ) )
                                                 evt.data.dialog = 'editplaceholder';
                                 });
 
@@ -156 +155 @@
                 }
                 else
                         editor.insertElement( element );
+        },
+
+        getSelectedPlaceHoder : function( editor )
+        {
+                var range = editor.getSelection().getRanges()[0];
+                range.shrink( CKEDITOR.SHRINK_TEXT );
+                var node = range.startContainer;
+                while( node && !( node.type == CKEDITOR.NODE_ELEMENT && node.data( 'cke-placeholder' ) ) )
+                        node = node.getParent();
+                return node;
         }
 };