Index: /CKEditor/trunk/CHANGES.html
===================================================================
--- /CKEditor/trunk/CHANGES.html	(revision 6319)
+++ /CKEditor/trunk/CHANGES.html	(revision 6320)
@@ -92,4 +92,5 @@
 		<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>
Index: /CKEditor/trunk/_source/plugins/placeholder/dialogs/placeholder.js
===================================================================
--- /CKEditor/trunk/_source/plugins/placeholder/dialogs/placeholder.js	(revision 6319)
+++ /CKEditor/trunk/_source/plugins/placeholder/dialogs/placeholder.js	(revision 6320)
@@ -49,12 +49,5 @@
 			{
 				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 );
Index: /CKEditor/trunk/_source/plugins/placeholder/plugin.js
===================================================================
--- /CKEditor/trunk/_source/plugins/placeholder/plugin.js	(revision 6319)
+++ /CKEditor/trunk/_source/plugins/placeholder/plugin.js	(revision 6320)
@@ -59,6 +59,5 @@
 			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,4 +156,14 @@
 		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;
 	}
 };