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

[fnpeditor.git] / src / editor / modules / nodeBreadCrumbs / nodeBreadCrumbs.js

diff --git a/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js b/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js
index 320a1e8..0540542 100644 (file)
--- a/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js
+++ b/src/editor/modules/nodeBreadCrumbs/nodeBreadCrumbs.js
@@ -8,12 +8,12 @@ define([
 
 return function(sandbox) {
     
 
 return function(sandbox) {
     

-    var template = _.template(templateSrc);
+    var template = _.template(templateSrc),
+        listens = false;

     
     var view = {
         dom: $('<div>' + template({node:null, parents: null}) + '</div>'),
         setup: function() {
     
     var view = {
         dom: $('<div>' + template({node:null, parents: null}) + '</div>'),
         setup: function() {

-            var view = this;

             this.dom.on('mouseenter', 'a', function(e) {
                 var target = $(e.target);
                 sandbox.publish('elementEntered', target.data('element'));
             this.dom.on('mouseenter', 'a', function(e) {
                 var target = $(e.target);
                 sandbox.publish('elementEntered', target.data('element'));


@@ -32,8 +32,12 @@ return function(sandbox) {
         setNodeElement: function(nodeElement) {
             this.dom.empty();
             this.currentNodeElement = nodeElement;
         setNodeElement: function(nodeElement) {
             this.dom.empty();
             this.currentNodeElement = nodeElement;

-            var parents = nodeElement.parents();
-            this.dom.html(template({node: nodeElement, parents: parents, tagNames: wlxmlUtils.wlxmlTagNames, classNames: wlxmlUtils.wlxmlClassNames}));
+            var parents;
+            if(nodeElement) {
+                parents = nodeElement.parents();
+            }
+
+            this.dom.html(template({node: nodeElement, parents: parents, utils: wlxmlUtils}));

 
             this.dom.find('li > a[href="#"]').each(function(idx, a) {
                 $(a).data('element', parents[parents.length - 1 - idx]);
 
             this.dom.find('li > a[href="#"]').each(function(idx, a) {
                 $(a).data('element', parents[parents.length - 1 - idx]);


@@ -55,6 +59,14 @@ return function(sandbox) {
         start: function() { sandbox.publish('ready'); },
         getView: function() { return view.dom; },
         setNodeElement: function(nodeElement) {
         start: function() { sandbox.publish('ready'); },
         getView: function() { return view.dom; },
         setNodeElement: function(nodeElement) {

+            if(!listens && nodeElement) {
+                nodeElement.document.on('change', function() {
+                    if(view.currentNodeElement && !view.currentNodeElement.isInDocument()) {
+                        view.setNodeElement(null);
+                    }
+                });
+                listens = true;
+            }

             view.setNodeElement(nodeElement);
         },
         highlightNode: function(id) { view.highlightNode(id); },
             view.setNodeElement(nodeElement);
         },
         highlightNode: function(id) { view.highlightNode(id); },