Merge pull request codex-team#199 from codex-team/placeholder

Add custom placeholder
ChaituVR · Aug 30, 2017 · 73ebe41 · 73ebe41
2 parents 91011e6 + 49827b7
commit 73ebe41
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 12 deletions.
diff --git a/codex-editor.js b/codex-editor.js
diff --git a/codex-editor.js.map b/codex-editor.js.map
diff --git a/example.html b/example.html
@@ -222,9 +222,10 @@
         },
         data : {
             id: +new Date(),
+            placeholder: 'Прошлой ночью мне приснилось...',
             items: [
                 {
-                    type : 'paragraph',
+                    type : 'header',
                     data : {
                         text : 'Привет от CodeX'
                     }
@@ -235,13 +236,6 @@
                         text : 'Пишите нам на team@ifmo.su'
                     }
                 },
-                {
-                    type : 'list',
-                    data : {
-                        type : 'OL',
-                        items : [1,3,4]
-                    }
-                }
             ],
             count: 3
         }

diff --git a/modules/ui.js b/modules/ui.js
@@ -405,7 +405,9 @@ module.exports = (function (ui) {
 
         initialBlock = editor.tools[initialBlockType].render();
 
-        initialBlock.setAttribute('data-placeholder', 'Расскажите свою историю...');
+        let initialBlockPlaceholder = editor.state.blocks.placeholder || '';
+
+        initialBlock.setAttribute('data-placeholder', initialBlockPlaceholder);
 
         editor.content.insertBlock({
             type  : initialBlockType,

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "codex.editor",
-  "version": "1.7.3",
+  "version": "1.7.4",
   "description": "Codex Editor. Native JS, based on API and Open Source",
   "main": "index.js",
   "scripts": {