editor: canvas displays span node as block if it contains non span nodes

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / wlxmlManagers.js

diff --git a/src/editor/modules/documentCanvas/canvas/wlxmlManagers.js b/src/editor/modules/documentCanvas/canvas/wlxmlManagers.js
index 1078218..6b8b5ff 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/wlxmlManagers.js
+++ b/src/editor/modules/documentCanvas/canvas/wlxmlManagers.js
@@ -41,8 +41,7 @@ var DocumentElementWrapper = function(documentElement) {
         eventBus.trigger.apply(eventBus, arguments);
     };
 
-    this.node = documentElement.data('wlxmlNode');
-
+    this.node = documentElement.wlxmlNode;
 };
 
 var getDisplayStyle = function(tag, klass) {
@@ -55,6 +54,9 @@ var getDisplayStyle = function(tag, klass) {
     if(klass && klass.substr(0, 4) === 'item') {
         return null;
     }
+    if(klass === 'gap') {
+        return 'inline';
+    }
     return 'block';
 };
 
@@ -67,8 +69,6 @@ $.extend(GenericManager.prototype, {
         this.el.setDisplayStyle(getDisplayStyle(this.el.tag(), this.el.klass()));
 
         this.el.clearWidgets();
-        this.el.addWidget(widgets.labelWidget(this.el.tag(), this.el.klass()));
-
     },
     toggle: function(toggle) {
         this.el.toggle(toggle);
@@ -135,8 +135,6 @@ var ListItemManager = function(wlxmlElement) {
 $.extend(ListItemManager.prototype, {
     setup: function() {
         this.el.clearWidgets();
-        this.el.addWidget(widgets.labelWidget(this.el.tag(), this.el.klass()));
-        this.el.documentElement._container().css({display: 'list-item'});
     },
     toggleBullet: function(toggle) {
         this.el.documentElement._container().css({display : toggle ? 'list-item' : 'block'});
@@ -152,7 +150,6 @@ var CommentManager = function(wlxmlElement) {
 $.extend(CommentManager.prototype, {
     setup: function() {
         this.el.clearWidgets();
-        this.el.addWidget(widgets.labelWidget(this.el.tag(), this.el.klass()));
 
         this.widget = widgets.commentAdnotation(this.el.node);
         this.el.addWidget(this.widget);