X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/b26c53066ad699546ffcb888c7c9d779a51595c6..04b969b68c922970339a783e865bb1f9c593946c:/src/editor/plugins/core/core.js

diff --git a/src/editor/plugins/core/core.js b/src/editor/plugins/core/core.js
index 4c58129..c2c5ffa 100644
--- a/src/editor/plugins/core/core.js
+++ b/src/editor/plugins/core/core.js
@@ -234,10 +234,12 @@ plugin.documentExtension.documentNode.transformations = {
                     return toMerge.is({tagName: 'div', 'klass': 'p'}) || (toMerge.is({tagName: 'div'}) && toMerge.getClass() === '');
                 },
                 run: function() {
-                    if(prev && (prev.is('p') || prev.is({tagName: 'header'}))) {
+                    if (!prev)
+                        return;
+                    if(prev.is('p') || prev.is({tagName: 'header'})) {
                         return merge(toMerge, prev);
                     }
-                    if(prev && prev.is('list')) {
+                    if(prev.is('list')) {
                         var items = prev.contents().filter(function(n) { return n.is('item');});
                         return merge(toMerge, items[items.length-1]);
                     }
@@ -294,7 +296,7 @@ plugin.documentExtension.documentNode.transformations = {
                     return toMerge.is({tagName: 'header'});
                 },
                 run: function() {
-                    if(prev && prev.is('p') || prev.is({tagName: 'header'})) {
+                    if(prev && (prev.is('p') || prev.is({tagName: 'header'}))) {
                         return merge(toMerge, prev);
                     }
                 }