From fb3d95175e7e029d2175fa4b6f6a1c65a48c3854 Mon Sep 17 00:00:00 2001
From: Artur Arseniev <artur.catch@hotmail.it>
Date: Wed, 22 Jun 2016 22:05:23 +0200
Subject: [PATCH] Update parser

---
 index.html                            |  1 -
 src/parser/model/ParserHtml.js        |  3 ++-
 test/specs/parser/model/ParserHtml.js | 13 +++++++++++++
 3 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/index.html b/index.html
index 98034a90b..6002adc8b 100755
--- a/index.html
+++ b/index.html
@@ -16,7 +16,6 @@
 			<header class="header-banner">
 				<div class="container-width">
 					<div class="logo-container">
-						<div></div>
 						<div class="logo">GrapesJS</div>
 					</div>
 					<nav class="navbar">
diff --git a/src/parser/model/ParserHtml.js b/src/parser/model/ParserHtml.js
index 735a4f17c..8167701bb 100644
--- a/src/parser/model/ParserHtml.js
+++ b/src/parser/model/ParserHtml.js
@@ -101,7 +101,8 @@ define(function(require) {
               // From: <div> <span>TEST</span> </div> <-- span is text type
               // TO: <div> TEST </div> <-- div become text type
               // With 'nodeChild > 1' I know that nodes were merged
-              if(parsed.length == 1 && parsed[0].type == 'text' && nodeChild > 1){
+              if(parsed.length == 1 && parsed[0].type == 'text' &&
+                nodeChild > 1 && parsed[0].tagName == TEXT_NODE){
                 model.type = 'text';
                 model.content = parsed[0].content;
               }else
diff --git a/test/specs/parser/model/ParserHtml.js b/test/specs/parser/model/ParserHtml.js
index 40309f775..4a8b647ac 100644
--- a/test/specs/parser/model/ParserHtml.js
+++ b/test/specs/parser/model/ParserHtml.js
@@ -235,6 +235,19 @@ define([path + 'model/ParserHtml', path + 'model/ParserCss'],
             res.css.should.deep.equal(resCss);
           });
 
+          it('Parse nested div with text and spaces', function() {
+            var str = '<div> <p>TestText</p> </div>';
+            var result = {
+              tagName: 'div',
+              components: [{
+                tagName: 'p',
+                content: 'TestText',
+                type: 'text',
+              }],
+            };
+            obj.parse(str).html.should.deep.equal(result);
+          });
+
         });
 
       }