Explorar el Código

Allowed configurable placeholder text. Added placeholder manual test.

Aleksander Nowodzinski hace 7 años
padre
commit
a8b9d09fc6

+ 8 - 1
packages/ckeditor5-editor-inline/src/inlineeditorui.js

@@ -109,7 +109,14 @@ export default class InlineEditorUI extends EditorUI {
 		// original content.
 		editor.on( 'dataReady', () => {
 			editable.enableEditingRootListeners();
-			attachPlaceholder( editingView, getPlaceholderElement( editingRoot ), 'Type some text...' );
+
+			const placeholderText = editor.config.get( 'placeholder' ) || editor.sourceElement.getAttribute( 'placeholder' );
+
+			if ( placeholderText ) {
+				const placeholderElement = getPlaceholderElement( editingRoot );
+
+				attachPlaceholder( editingView, placeholderElement, placeholderText );
+			}
 		} );
 
 		this._initToolbar();

+ 3 - 0
packages/ckeditor5-editor-inline/tests/manual/placeholder.html

@@ -0,0 +1,3 @@
+<div id="editor-1" placeholder="Placeholder from the attribute"></div>
+<br />
+<div id="editor-2" placeholder="Placeholder from the attribute"></div>

+ 37 - 0
packages/ckeditor5-editor-inline/tests/manual/placeholder.js

@@ -0,0 +1,37 @@
+/**
+ * @license Copyright (c) 2003-2018, CKSource - Frederico Knabben. All rights reserved.
+ * For licensing, see LICENSE.md.
+ */
+
+/* globals console:false, document, window */
+
+import InlineEditor from '../../src/inlineeditor';
+import Enter from '@ckeditor/ckeditor5-enter/src/enter';
+import Typing from '@ckeditor/ckeditor5-typing/src/typing';
+import Heading from '@ckeditor/ckeditor5-heading/src/heading';
+import Paragraph from '@ckeditor/ckeditor5-paragraph/src/paragraph';
+import Undo from '@ckeditor/ckeditor5-undo/src/undo';
+import Bold from '@ckeditor/ckeditor5-basic-styles/src/bold';
+import Italic from '@ckeditor/ckeditor5-basic-styles/src/italic';
+
+window.editors = {};
+
+function initEditor( element, placeholder ) {
+	InlineEditor
+		.create( element, {
+			plugins: [ Enter, Typing, Paragraph, Undo, Heading, Bold, Italic ],
+			toolbar: [ 'heading', '|', 'bold', 'italic', 'undo', 'redo' ],
+			placeholder
+		} )
+		.then( newEditor => {
+			console.log( 'Editor was initialized', newEditor );
+
+			window.editors[ element.id ] = newEditor;
+		} )
+		.catch( err => {
+			console.error( err.stack );
+		} );
+}
+
+initEditor( document.querySelector( '#editor-1' ) );
+initEditor( document.querySelector( '#editor-2' ), 'The placeholder from editor.config.placeholder' );

+ 1 - 0
packages/ckeditor5-editor-inline/tests/manual/placeholder.md

@@ -0,0 +1 @@
+TODO