Changeset 6320

Timestamp:

01/14/11 17:24:42 (2 years ago)

Author:

garry.yao

Message:

#6860: double click behavior correction in FF on read-only elements.

Location:

CKEditor/trunk

Files:

• CHANGES.html (modified) (1 diff)
• _source/plugins/placeholder/dialogs/placeholder.js (modified) (1 diff)
• _source/plugins/placeholder/plugin.js (modified) (2 diffs)

CKEditor/trunk/CHANGES.html

@@ -92 +92 @@
                 <li><a href="http://dev.ckeditor.com/ticket/6639">#6639</a> :  Line-breaks inside pasted list item from MS-Word breaks list structure.</li>
                 <li><a href="http://dev.ckeditor.com/ticket/6909">#6909</a> :  [IE] GIF icons of toolbar button from custom plugins are not diplayed in zoom level 100%.</li>
+                <li><a href="http://dev.ckeditor.com/ticket/6860">#6860</a> :  [FF] double click on placeholder to open dialog throws JavaScript error.</li>
         </ul>
         <h3>

CKEditor/trunk/_source/plugins/placeholder/dialogs/placeholder.js

@@ -49 +49 @@
                         {
                                 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 );

CKEditor/trunk/_source/plugins/placeholder/plugin.js

@@ -59 +59 @@
                         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';
                                 });
@@ -157 +156 @@
                 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;
         }
 };