smartxml: DocumentNode.isInDocument syntactic sugar

[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 afa510f..27160e7 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/documentElement.js
+++ b/src/editor/modules/documentCanvas/canvas/documentElement.js
@@ -11,9 +11,6 @@ define([
 
 // DocumentElement represents a text or an element node from WLXML document rendered inside Canvas
 var DocumentElement = function(wlxmlNode, canvas) {
 
 // DocumentElement represents a text or an element node from WLXML document rendered inside Canvas
 var DocumentElement = function(wlxmlNode, canvas) {

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

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


@@ -50,16 +47,9 @@ $.extend(DocumentElement.prototype, {
         return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },
 
         return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0];
     },
 

-    markAsCurrent: function() {
-        this.canvas.markAsCurrent(this);
-    },
-

     getVerticallyFirstTextElement: function() {
         var toret;
         this.children().some(function(child) {
     getVerticallyFirstTextElement: function() {
         var toret;
         this.children().some(function(child) {

-            if(!child.isVisible()) {
-                return false; // continue
-            }

             if(child instanceof DocumentTextElement) {
                 toret = child;
                 return true; // break
             if(child instanceof DocumentTextElement) {
                 toret = child;
                 return true; // break


@@ -87,16 +77,6 @@ $.extend(DocumentElement.prototype, {
         return this.canvas.getDocumentElement(utils.nearestInDocumentOrder(selector, direction, this.dom()[0]));
     },
 
         return this.canvas.getDocumentElement(utils.nearestInDocumentOrder(selector, direction, this.dom()[0]));
     },
 

-    isVisible: function() {
-        return this instanceof DocumentTextElement || this.getWlxmlTag() !== 'metadata';
-    },
-
-    isInsideList: function() {
-        return this.parents().some(function(parent) {
-            return parent.is('list');
-        });
-    },
-

     exec: function(method) {
         if(this.manager && this.manager[method]) {
             return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1));
     exec: function(method) {
         if(this.manager && this.manager[method]) {
             return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1));


@@ -124,7 +104,7 @@ var manipulate = function(e, params, action) {
     return element;
 };
 
     return element;
 };
 

-DocumentNodeElement.prototype = new DocumentElement();
+DocumentNodeElement.prototype = Object.create(DocumentElement.prototype);

 
 
 $.extend(DocumentNodeElement.prototype, {
 
 
 $.extend(DocumentNodeElement.prototype, {


@@ -141,7 +121,9 @@ $.extend(DocumentNodeElement.prototype, {
         // Make sure widgets aren't navigable with arrow keys
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
         this.$element = dom; //@!!!
         // Make sure widgets aren't navigable with arrow keys
         widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1);
         this.$element = dom; //@!!!

-        this.setWlxml({tag: this.wlxmlNode.getTagName(), klass: this.wlxmlNode.getClass()});
+
+        this.setWlxmlTag(this.wlxmlNode.getTagName());
+        this.setWlxmlClass(this.wlxmlNode.getClass());

 
         this.wlxmlNode.contents().forEach(function(node) {
             container.append(this.canvas.createElement(node).dom());
 
         this.wlxmlNode.contents().forEach(function(node) {
             container.append(this.canvas.createElement(node).dom());


@@ -202,14 +184,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');


@@ -228,31 +203,9 @@ $.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() {

         this.manager = wlxmlManagers.getFor(this);
         this.manager.setup();
     },
         this.manager = wlxmlManagers.getFor(this);
         this.manager.setup();
     },

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

     toggleLabel: function(toggle) {
         var displayCss = toggle ? 'inline-block' : 'none';
         var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');
     toggleLabel: function(toggle) {
         var displayCss = toggle ? 'inline-block' : 'none';
         var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');


@@ -283,7 +236,7 @@ $.extend(DocumentTextElement, {
     }
 });
 
     }
 });
 

-DocumentTextElement.prototype = new DocumentElement();
+DocumentTextElement.prototype = Object.create(DocumentElement.prototype);

 
 $.extend(DocumentTextElement.prototype, {
     createDOM: function() {
 
 $.extend(DocumentTextElement.prototype, {
     createDOM: function() {