editor: removing lists via lists buttons

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

diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js
index 60e179d..f4505b0 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -10,32 +10,24 @@ define([
 
 
 // DocumentElement represents a text or an element node from WLXML document rendered inside Canvas
 
 
 // DocumentElement represents a text or an element node from WLXML document rendered inside Canvas

-var DocumentElement = function(htmlElement, canvas) {
+var DocumentElement = function(wlxmlNode, canvas) {

     if(arguments.length === 0) {
         return;
     }
     if(arguments.length === 0) {
         return;
     }

+    this.wlxmlNode = wlxmlNode;

     this.canvas = canvas;
     this.canvas = canvas;

-    this._setupDOMHandler(htmlElement);
+
+    this.$element = this.createDOM();
+    this.$element.data('canvas-element', this);

 };
 
 $.extend(DocumentElement.prototype, {
 };
 
 $.extend(DocumentElement.prototype, {

-    _setupDOMHandler: function(htmlElement) {
-        this.$element = $(htmlElement);
-    },

     bound: function() {
         return $.contains(document.documentElement, this.dom()[0]);
     },
     dom: function() {
         return this.$element;
     },
     bound: function() {
         return $.contains(document.documentElement, this.dom()[0]);
     },
     dom: function() {
         return this.$element;
     },

-    data: function() {
-        var dom = this.dom(),
-            args = Array.prototype.slice.call(arguments, 0);
-        if(args.length === 2 && args[1] === undefined) {
-            return dom.removeData(args[0]);
-        }
-        return dom.data.apply(dom, arguments);
-    },

     parent: function() {
         var parents = this.$element.parents('[document-node-element]');
         if(parents.length) {
     parent: function() {
         var parents = this.$element.parents('[document-node-element]');
         if(parents.length) {


@@ -106,47 +98,19 @@ $.extend(DocumentElement.prototype, {
     },
 
     exec: function(method) {
     },
 
     exec: function(method) {

-        var manager = this.data('_wlxmlManager');
-        if(manager[method]) {
-            return manager[method].apply(manager, Array.prototype.slice.call(arguments, 1));
+        if(this.manager && this.manager[method]) {
+            return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1));

         }
     }
 });
 
 
 // DocumentNodeElement represents an element node from WLXML document rendered inside Canvas
         }
     }
 });
 
 
 // DocumentNodeElement represents an element node from WLXML document rendered inside Canvas

-var DocumentNodeElement = function(htmlElement, canvas) {
-    DocumentElement.call(this, htmlElement, canvas);
+var DocumentNodeElement = function(wlxmlNode, canvas) {
+    DocumentElement.call(this, wlxmlNode, canvas);
+    wlxmlNode.setData('canvasElement', this);

 };
 
 };
 

-$.extend(DocumentNodeElement, {
-    create: function(wlxmlNode, canvas) {
-        var dom = $('<div>')
-                .attr('document-node-element', ''),
-            widgetsContainer = $('<div>')
-                .addClass('canvas-widgets')
-                .attr('contenteditable', false),
-            container = $('<div>')
-                .attr('document-element-content', '');
-        
-        dom.append(widgetsContainer, container);
-        // Make sure widgets aren't navigable with arrow keys
-        widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
-
-        var element = canvas.getDocumentElement(dom[0]);
-
-        element.data('wlxmlNode', wlxmlNode);
-        wlxmlNode.setData('canvasElement', element);
-
-        element.setWlxml({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()});
-
-        wlxmlNode.contents().forEach(function(node) {
-            container.append(canvas.createElement(node).dom());
-        }.bind(this));
-
-        return element;
-    }
-});

 
 var manipulate = function(e, params, action) {
     var element;
 
 var manipulate = function(e, params, action) {
     var element;


@@ -164,6 +128,28 @@ DocumentNodeElement.prototype = new DocumentElement();
 
 
 $.extend(DocumentNodeElement.prototype, {
 
 
 $.extend(DocumentNodeElement.prototype, {

+    createDOM: function() {
+        var dom = $('<div>')
+                .attr('document-node-element', ''),
+            widgetsContainer = $('<div>')
+                .addClass('canvas-widgets')
+                .attr('contenteditable', false),
+            container = $('<div>')
+                .attr('document-element-content', '');
+        
+        dom.append(widgetsContainer, container);
+        // Make sure widgets aren't navigable with arrow keys
+        widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
+        this.$element = dom; //@!!!
+
+        this.setWlxmlTag(this.wlxmlNode.getTagName());
+        this.setWlxmlClass(this.wlxmlNode.getClass());
+
+        this.wlxmlNode.contents().forEach(function(node) {
+            container.append(this.canvas.createElement(node).dom());
+        }.bind(this));
+        return dom;
+    },

     _container: function() {
         return this.dom().children('[document-element-content]');
     },
     _container: function() {
         return this.dom().children('[document-element-content]');
     },


@@ -218,14 +204,7 @@ $.extend(DocumentNodeElement.prototype, {
         return this._container().attr('wlxml-tag');
     },
     setWlxmlTag: function(tag) {
         return this._container().attr('wlxml-tag');
     },
     setWlxmlTag: function(tag) {

-        if(tag === this.getWlxmlTag()) {
-            return;
-        }
-

         this._container().attr('wlxml-tag', tag);
         this._container().attr('wlxml-tag', tag);

-        if(!this.__updatingWlxml) {
-            this._updateWlxmlManager();
-        }

     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');
     },
     getWlxmlClass: function() {
         var klass = this._container().attr('wlxml-class');


@@ -244,25 +223,8 @@ $.extend(DocumentNodeElement.prototype, {
         else {
             this._container().removeAttr('wlxml-class');
         }
         else {
             this._container().removeAttr('wlxml-class');
         }

-        if(!this.__updatingWlxml) {
-            this._updateWlxmlManager();
-        }
-    },
-    setWlxml: function(params) {
-        this.__updatingWlxml = true;
-        if(params.tag !== undefined) {
-            this.setWlxmlTag(params.tag);
-        }
-        if(params.klass !== undefined) {
-            this.setWlxmlClass(params.klass);
-        }
-        this._updateWlxmlManager();
-        this.__updatingWlxml = false;
-    },
-    _updateWlxmlManager: function() {
-        var manager = wlxmlManagers.getFor(this);
-        this.data('_wlxmlManager', manager);
-        manager.setup();
+        this.manager = wlxmlManagers.getFor(this);
+        this.manager.setup();

     },
     is: function(what) {
         if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass())) {
     },
     is: function(what) {
         if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass())) {


@@ -282,29 +244,19 @@ $.extend(DocumentNodeElement.prototype, {
     },
 
     toggle: function(toggle) {
     },
 
     toggle: function(toggle) {

-        var mng = this.data('_wlxmlManager');
-        if(mng) {
-            mng.toggle(toggle);
+        if(this.manager) {
+            this.manager.toggle(toggle);

         }
     }
 });
 
 
 // DocumentNodeElement represents a text node from WLXML document rendered inside Canvas
         }
     }
 });
 
 
 // DocumentNodeElement represents a text node from WLXML document rendered inside Canvas

-var DocumentTextElement = function(htmlElement, canvas) {
-    DocumentElement.call(this, htmlElement, canvas);
+var DocumentTextElement = function(wlxmlTextNode, canvas) {
+    DocumentElement.call(this, wlxmlTextNode, canvas);

 };
 
 $.extend(DocumentTextElement, {
 };
 
 $.extend(DocumentTextElement, {

-    create: function(wlxmlTextNode, canvas) {
-        var dom = $('<div>')
-            .attr('document-text-element', '')
-            .text(wlxmlTextNode.getText() || utils.unicode.ZWS),
-        element = canvas.getDocumentElement(dom[0]);
-        element.data('wlxmlNode', wlxmlTextNode);
-        return element;
-    },
-

     isContentContainer: function(htmlElement) {
         return htmlElement.nodeType === Node.TEXT_NODE && $(htmlElement).parent().is('[document-text-element]');
     }
     isContentContainer: function(htmlElement) {
         return htmlElement.nodeType === Node.TEXT_NODE && $(htmlElement).parent().is('[document-text-element]');
     }


@@ -313,14 +265,10 @@ $.extend(DocumentTextElement, {
 DocumentTextElement.prototype = new DocumentElement();
 
 $.extend(DocumentTextElement.prototype, {
 DocumentTextElement.prototype = new DocumentElement();
 
 $.extend(DocumentTextElement.prototype, {

-    _setupDOMHandler: function(htmlElement) {
-        var $element = $(htmlElement);
-        if(htmlElement.nodeType === Node.TEXT_NODE) {
-            this.$element = $element.parent();
-        }
-        else {
-            this.$element = $element;
-        }
+    createDOM: function() {
+        return $('<div>')
+            .attr('document-text-element', '')
+            .text(this.wlxmlNode.getText() || utils.unicode.ZWS);

     },
     detach: function() {
         this.dom().detach();
     },
     detach: function() {
         this.dom().detach();