Refactor Editor and update on Components

src/dom_components/main.js

@@ -59,21 +59,21 @@ define(function(require) {
 			if (!(name in c))
 				c[name] = defaults[name];
 		}
-
+/*
-		if(!c.wrapper.attributes)
-			c.wrapper.attributes 	= {};
-		c.wrapper.attributes.id		= 'wrapper';
-
 		// If there is no components try to append defaults
 		if(!c.wrapper.components.length && c.defaults.length){
 			c.wrapper.components = c.defaults;
 		}
+*/
+		//c.wrapper.style.position	= 'relative';
+		var component		= new Component(c.wrapper, { sm: c.em });
 
-		if(!c.wrapper.style)
+		component.set({
-			c.wrapper.style 		= {};
+			attributes: {id: 'wrapper'}
+		});
 
-		c.wrapper.style.position	= 'relative';
+		if(c.components)
-		var component		= new Component(c.wrapper, { sm: c.em });
+			component.get('components').add(c.components);
 
 		var obj				= {
 			model: component,
@@ -178,9 +178,32 @@ define(function(require) {
 			 * updated immediately
 			 * @return {HTMLElement}
 			 */
-			render		: function(){
+			render: function(){
 				return componentView.render().el;
 			},
+
+			/**
+			 * Clear all components
+			 * @return {this}
+			 * @private
+			 */
+			clear: function(){
+				var c = this.getComponents();
+				for(var i = 0, len = c.length; i < len; i++)
+					c.pop();
+				return this;
+			},
+
+			/**
+			 * Set components
+			 * @param {Object|string} components HTML string or components model
+			 * @return {this}
+			 * @private
+			 */
+			setComponents: function(components){
+				this.clear().addComponent(components);
+			},
+
 		};
 	};
 

src/dom_components/model/Components.js

@@ -5,6 +5,10 @@ define([ 'backbone', 'require'],
 
 			initialize: function(models, opt){
 
+				// Inject editor
+				if(opt && opt.sm)
+					this.editor = opt.sm;
+
 				this.model	= function(attrs, options) {
 					var model;
 
@@ -37,5 +41,12 @@ define([ 'backbone', 'require'],
 
 			},
 
+			add: function(models, opt){
+				if(typeof models === 'string')
+					models = this.editor.Parser.parseHtml(models);
+
+				return Backbone.Collection.prototype.add.apply(this, [models, opt]);
+			},
+
 		});
 });

src/editor/config/config.js

@@ -1,6 +1,9 @@
 define(function () {
 	var config = {
 
+		//TEMP
+		components: '',
+
 		// Style prefix
 		stylePrefix: 'wte-',
 
@@ -46,8 +49,8 @@ define(function () {
 		//Configurations for Rich Text Editor
 		rte								: {},
 
-		//Configurations for Components
+		//Configurations for DomComponents
-		components				: {},
+		domComponents			: {},
 
 		//Configurations for Modal Dialog
 		modal							: {},

src/editor/model/Editor.js

@@ -49,6 +49,7 @@ define([
 				this.rulesName	= this.pfx + 'rules' + this.config.id;
 				this.set('Config', c);
 
+				this.initParser();
 				this.initStorage();
 				this.initClassManager();
 				this.initModal();
@@ -62,7 +63,6 @@ define([
 				this.initUndoManager();
 				this.initCssComposer();
 				this.initUtils();
-				this.initParser();
 
 				this.on('change:selectedComponent', this.componentSelected, this);
 			},
@@ -71,8 +71,8 @@ define([
 			 * Initialize Parser
 			 * */
 			initParser: function() {
-				this.parser = new Parser();
+				this.Parser = new Parser();
-				this.set('parser', this.parser);
+				this.set('parser', this.Parser);
 			},
 
 			/**
@@ -161,30 +161,31 @@ define([
 			 * @private
 			 * */
 			initComponents: function() {
-				var cfg				= this.config.components,
+				var cfg = this.config.domComponents,
-					comp				= this.loadComponents(),
+				comp = this.loadComponents(),
-					cmpStylePfx	= cfg.stylePrefix || 'comp-';
+				cmpStylePfx	= cfg.stylePrefix || 'comp-';
 
 				cfg.stylePrefix	= this.config.stylePrefix + cmpStylePfx;
 
 				if(comp)
-					cfg.wrapper	= comp;
+					cfg.components = comp;
 
 				if(this.rte)
-					cfg.rte			= this.rte;
+					cfg.rte = this.rte;
 
 				if(this.modal)
-					cfg.modal		= this.modal;
+					cfg.modal = this.modal;
 
 				if(this.am)
-					cfg.am			= this.am;
+					cfg.am = this.am;
 
-				cfg.em				= this;
+				cfg.em = this;
 
-				this.cmp 			= new DomComponents(cfg);
+				this.cmp = new DomComponents(cfg);
 				this.Components = this.cmp;
+
 				if(this.stm.isAutosave()){
-					var md 	= this.cmp.getComponent();
+					var md = this.cmp.getComponent();
 					this.updateComponents( md, null, { avoidStore : 1 });
 
 					// Call UndoManager here so it's possible to call it also for children inside
@@ -398,15 +399,20 @@ define([
 			 * @return	{Object}
 			 * */
 			loadComponents: function() {
-				var result = null;
+				var comps = '';
-				try{
+				var result = this.getCacheLoad();
-					var r = this.stm.load(this.compName);
+
-					if(r)
+				if(result.components){
-						result	=  JSON.parse(r);
+					try{
-				}catch(err){
+						comps	=  JSON.parse(result.components);
-					//console.warn("Error encountered while parsing JSON response");
+					}catch(err){}
+				}else if(result.html){
+					comps = result.html;
 				}
-				return result;
+
+				console.log('loadComponents');
+				console.log(comps);
+				return comps;
 			},
 
 			/**
@@ -415,11 +421,12 @@ define([
 			 * @return void
 			 * */
 			storeComponents: function() {
-				var wrp	= this.cmp.getComponent();
+				/*var wrp	= this.cmp.getComponent();
 				if(wrp && this.cm){
 					var res	= this.cm.getCode(wrp, 'json');
 					this.stm.store(this.compName, JSON.stringify(res));
-				}
+				}*/
+				this.store();
 			},
 
 			/**
@@ -518,7 +525,7 @@ define([
 			 * @return {this}
 			 */
 			setComponents: function(components){
-				return this;
+				return this.Components.setComponents(components);
 			},
 
 			/**
@@ -608,6 +615,8 @@ define([
 				if(smc.storeStyles)
 					store.styles = JSON.stringify(this.getStyle());
 
+				console.log('Store');
+				console.log(store);
 				sm.store(store);
 			},
 
@@ -615,11 +624,38 @@ define([
 			 * Load data from the current storage
 			 */
 			load: function(){
+				var result = this.getCacheLoad(1);
+				var comps = [];
+
+				if(result.components){
+					try{
+						comps	=  JSON.parse(result.components);
+					}catch(err){}
+				}else if(result.html){
+					comps = result.html;
+				}
+
+				console.log(result);
+				//this.setComponents(comps);
+			},
+
+			/**
+			 * Returns cached load
+			 * @param {Boolean} force Force to reload
+			 * @return {Object}
+			 * @private
+			 */
+			getCacheLoad: function(force){
+				var f = force ? 1 : 0;
+
+				if(this.cacheLoad && !f)
+					return this.cacheLoad;
+
 				var sm = this.StorageManager;
 				var load = [];
 
 				if(!sm)
-					return;
+					return {};
 
 				var smc = sm.getConfig();
 
@@ -635,20 +671,9 @@ define([
 				if(smc.storeStyles)
 					load.push('styles');
 
-				var result = sm.load(load);
+				this.cacheLoad = sm.load(load);
-
-				var comps = [];
-				if(result.components){
-					try{
-						comps	=  JSON.parse(result.components);
-					}catch(err){}
-				}else if(result.html){
-					comps = result.html;
-				}
-
-				console.log(result);
-				//this.setComponents(comps);
 
+				return this.cacheLoad;
 			},
 
 		});

src/parser/model/ParserHtml.js

@@ -2,6 +2,8 @@ define(function(require) {
 
   return function(config) {
 
+    var TEXT_NODE = 'span';
+
     return {
 
       /**
@@ -84,13 +86,21 @@ define(function(require) {
           }
 
           // Check for nested elements
-          if(node.childNodes.length)
+          var nodeChild = node.childNodes.length;
-            model.components = this.parseNode(node);
+          if(nodeChild){
+            // Avoid infinite text nodes nesting
+            var firstChild = node.childNodes[0];
+            if(nodeChild === 1 && firstChild.nodeType === 3 && model.tagName === TEXT_NODE){
+              model.type = 'text';
+              model.content = firstChild.nodeValue;
+            }else
+              model.components = this.parseNode(node);
+          }
 
           // Find text nodes
           if(!model.tagName && node.nodeType === 3 && node.nodeValue.trim()){
             model.type = 'text';
-            model.tagName = 'span';
+            model.tagName = TEXT_NODE;
             model.content = node.nodeValue;
           }
 

styles/css/main.css

@@ -2614,8 +2614,10 @@ html, body, #wte-app, .wte-editor {
   top: 0;
   left: 3.5%;
   overflow: auto;
-  z-index: 1; }
+  z-index: 1;
+  /* This simulate body behaviour */ }
   .wte-cv-canvas > div {
+    position: relative;
     height: 100%;
     overflow: auto;
     width: 100%; }
@@ -2686,7 +2688,7 @@ ol.example li.placeholder:before {
   outline: none !important; }
 
 /********* COMMANDS **********/
-.wte-com-dashed div {
+.wte-com-dashed * {
   outline: 1px dashed #888;
   outline-offset: -2px;
   box-sizing: border-box; }
@@ -3444,7 +3446,8 @@ ol.example li.placeholder:before {
     width: 25px;
     border-right: 1px solid #353535;
     text-align: center;
-    cursor: pointer; }
+    cursor: pointer;
+    outline: none; }
     #wte-rte-toolbar .wte-rte-btn:last-child {
       border-right: none; }
     #wte-rte-toolbar .wte-rte-btn.btn-info {

styles/scss/main.scss

@@ -98,7 +98,9 @@ html,body,#wte-app, .#{$app-prefix}editor{ height: 100%; }
   overflow: auto;
   z-index:1;
 
+  	/* This simulate body behaviour */
   	> div {
+  		position: relative;
 	    height: 100%;
 	    overflow: auto;
 	    width: 100%;
@@ -149,7 +151,7 @@ ol.example li.placeholder:before {position: absolute;}
 
 /********* COMMANDS **********/
 
-.#{$com-prefix}dashed div {
+.#{$com-prefix}dashed *{
 	outline: 1px dashed #888;
 	outline-offset: -2px;
   	box-sizing: border-box;
@@ -1031,12 +1033,13 @@ $uploadPadding:	150px 10px;
   z-index: 5;
 
   .#{$rte-prefix}btn {
-  		color: $fontColor;
+  	color: $fontColor;
 		padding: 5px;
 		width:	25px;
 		border-right: 1px solid #353535;
 		text-align: center;
 		cursor: pointer;
+		outline: none;
 
 	  	&:last-child{ border-right:none; }
 	  	&.btn-info{ background-color: darken($mainDkColor,3%); }

test/specs/dom_components/main.js

@@ -58,7 +58,7 @@ define([
 
 				it('Add components at init', function() {
 					obj = new DomComponents({
-						defaults : [{}, {}, {}]
+						components : [{}, {}, {}]
 					});
 					obj.getComponents().length.should.equal(3);
 				});

test/specs/parser/model/ParserHtml.js

@@ -155,6 +155,30 @@ define([path + 'model/ParserHtml',],
             obj.parse(str).should.deep.equal(result);
           });
 
+          it('Parse nested span text nodes', function() {
+            var str = '<div>content1 <div><span>nested</span></div> content2</div>';
+            var result = {
+              tagName: 'div',
+              components: [{
+                tagName: 'span',
+                type: 'text',
+                content: 'content1 ',
+              },{
+                tagName: 'div',
+                components: [{
+                  tagName: 'span',
+                  type: 'text',
+                  content: 'nested',
+                }]
+              },{
+                tagName: 'span',
+                type: 'text',
+                content: ' content2',
+              }],
+            };
+            obj.parse(str).should.deep.equal(result);
+          });
+
           it('Parse multiple nodes', function() {
             var str = '<div></div><div></div>';
             var result = [{ tagName: 'div'},{ tagName: 'div'}];