Bug fix

[fnpeditor.git] / modules / documentCanvas / canvas / documentElement.js

diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index f03719e..11c0f1f 100644 (file)
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -2,8 +2,9 @@ define([
 'libs/jquery-1.9.1.min',
 'libs/underscore-min',
 'modules/documentCanvas/classAttributes',
-'modules/documentCanvas/canvas/utils'
-], function($, _, classAttributes, utils) {
+'modules/documentCanvas/canvas/utils',
+'modules/documentCanvas/canvas/widgets'
+], function($, _, classAttributes, utils, widgets) {
     
 'use strict';
 
@@ -112,6 +113,14 @@ var DocumentNodeElement = function(htmlElement, canvas) {
     DocumentElement.call(this, htmlElement, canvas);
 };
 
+var getDisplayStyle = function(tag, klass) {
+    if(tag === 'metadata')
+        return 'none';
+    if(tag === 'span')
+        return 'inline';
+    return 'block';
+}
+
 $.extend(DocumentNodeElement, {
     createDOM: function(params) {
         var dom = $('<div document-node-element>'),
@@ -127,12 +136,17 @@ $.extend(DocumentNodeElement, {
         }
         dom.data('other-attrs', params.others);
 
-        var widgets = $('<div class="canvas-widgets" contenteditable="false">');
-        widgets.append($('<span class="canvas-widget canvas-widget-label">').text(params.tag + (params.klass ? ' / ' + params.klass : '')));
-        dom.append(widgets);
+        /* display style */
+        var displayStyle = getDisplayStyle(params.tag, params.klass);
+        dom.css('display', displayStyle);
+        container.css('display', displayStyle);
+
+        var widgetsContainer = $('<div class="canvas-widgets" contenteditable="false">');
+        widgetsContainer.append(widgets.labelWidget(params.tag, params.klass));
+        dom.append(widgetsContainer);
 
         // Make sure widgets aren't navigable with arrow keys
-        widgets.find('*').add(widgets).attr('tabindex', -1);
+        widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
         
         dom.append(container);
 
@@ -295,6 +309,7 @@ $.extend(DocumentNodeElement.prototype, {
     },
     setWlxmlTag: function(tag) {
         this._container().attr('wlxml-tag', tag);
+        this._updateDisplayStyle();
     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');
@@ -312,6 +327,12 @@ $.extend(DocumentNodeElement.prototype, {
             this._container().attr('wlxml-class', klass.replace(/\./g, '-'));
         else
             this._container().removeAttr('wlxml-class');
+        this._updateDisplayStyle();
+    },
+    _updateDisplayStyle: function() {
+        var displayStyle = getDisplayStyle(this.getWlxmlTag(), this.getWlxmlClass());
+        this.dom().css('display', displayStyle);
+        this._container().css('display', displayStyle);
     },
     is: function(what) {
         if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass()))
@@ -340,7 +361,11 @@ $.extend(DocumentNodeElement.prototype, {
         var displayCss = toggle ? 'inline-block' : 'none';
         var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');
         label.css('display', displayCss);
-        this.dom().toggleClass('highlighted-element');
+        this.toggleHighlight(toggle);
+    },
+
+    toggleHighlight: function(toogle) {
+        this._container().toggleClass('highlighted-element');
     }
 });
 
@@ -510,6 +535,10 @@ $.extend(DocumentTextElement.prototype, {
         this.after(newElement);
         newElement.after(rhsTextElement);
         return newElement;
+    },
+
+    toggleHighlight: function() {
+        // do nothing for now
     }
 });