smartxml: Better check for document being successfulfy parsed

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

diff --git a/src/editor/modules/documentCanvas/canvas/genericElement.js b/src/editor/modules/documentCanvas/canvas/genericElement.js
index bbb4b07..4dfbe59 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/genericElement.js
+++ b/src/editor/modules/documentCanvas/canvas/genericElement.js
@@ -6,7 +6,8 @@ var $ = require('libs/jquery'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
     utils = require('./utils'),
     _ = require('libs/underscore'),
     documentElement = require('./documentElement'),
     utils = require('./utils'),

-    wlxmlUtils = require('utils/wlxml');
+    wlxmlUtils = require('utils/wlxml'),
+    CommentsView = require('./comments/comments');

 
 var labelWidget = function(tag, klass) {
     return $('<span>')
 
 var labelWidget = function(tag, klass) {
     return $('<span>')


@@ -26,8 +27,21 @@ $.extend(generic, {
             .attr('wlxml-tag', this.wlxmlNode.getTagName());
         this.setWlxmlClass(this.wlxmlNode.getClass());
         this.wlxmlNode.contents().forEach(function(node) {
             .attr('wlxml-tag', this.wlxmlNode.getTagName());
         this.setWlxmlClass(this.wlxmlNode.getClass());
         this.wlxmlNode.contents().forEach(function(node) {

-            this._container().append(this.canvas.createElement(node).dom);
+            var el = this.canvas.createElement(node);
+            if(el.dom) {
+                this._container().append(el.dom);
+            }

         }.bind(this));
         }.bind(this));

+
+        this.commentsView = new CommentsView(this.wlxmlNode, this.canvas.metadata.user);
+        this.addToGutter(this.commentsView);
+        this.commentTip = $('<div class="comment-tip"><i class="icon-comment"></i></div>');
+        this.addWidget(this.commentTip);
+
+        if(!this.wlxmlNode.hasChild({klass: 'comment'})) {
+            this.commentTip.hide();
+        }
+

         this.refresh();
     },
     
         this.refresh();
     },
     


@@ -66,13 +80,18 @@ $.extend(generic, {
         return toret;
     },
 
         return toret;
     },
 

-    getVerticallyFirstTextElement: function() {
+    getVerticallyFirstTextElement: function(params) {

         var toret;
         var toret;

+        
+        params = _.extend({
+            considerChildren: true
+        }, params);
+        

         this.children().some(function(child) {
             if(child instanceof documentElement.DocumentTextElement) {
                 toret = child;
                 return true; // break
         this.children().some(function(child) {
             if(child instanceof documentElement.DocumentTextElement) {
                 toret = child;
                 return true; // break

-            } else {
+            } else if(params.considerChildren) {

                 toret = child.getVerticallyFirstTextElement();
                 if(toret) {
                     return true; // break
                 toret = child.getVerticallyFirstTextElement();
                 if(toret) {
                     return true; // break


@@ -93,31 +112,37 @@ $.extend(generic, {
             return;
         }
 
             return;
         }
 

-        var nodeIndex = event.meta.node.getIndex(),
+        var ptr = event.meta.node.prev(),

             referenceElement, referenceAction, actionArg;
             referenceElement, referenceAction, actionArg;

+            
+        while(ptr && !(referenceElement = utils.getElementForElementRootNode(ptr))) {
+            ptr = ptr.prev();
+        }

 
 

-        if(nodeIndex === 0) {
+        if(referenceElement) {
+            referenceAction = 'after';
+        } else {

             referenceElement = this;
             referenceAction = 'prepend';
             referenceElement = this;
             referenceAction = 'prepend';

-        } else {
-            referenceElement = this.children()[nodeIndex-1];
-            referenceAction = 'after';

         }
       
         if(event.meta.move) {
             /* Let's check if this node had its own canvas element and it's accessible. */
             actionArg = utils.getElementForElementRootNode(event.meta.node);
         }
       
         if(event.meta.move) {
             /* Let's check if this node had its own canvas element and it's accessible. */
             actionArg = utils.getElementForElementRootNode(event.meta.node);

-            if(actionArg && actionArg.sameNode(referenceElement)) {
-                referenceElement = this.children()[nodeIndex];
-            }

         }
         if(!actionArg) {
             actionArg = event.meta.node;
         }
 
         referenceElement[referenceAction](actionArg);
         }
         if(!actionArg) {
             actionArg = event.meta.node;
         }
 
         referenceElement[referenceAction](actionArg);

+
+        if(event.meta.node.is('comment')) {
+            this.commentTip.show();
+            this.commentsView.render();
+        }

     },
     onNodeDetached: function(event) {
     },
     onNodeDetached: function(event) {

+        var isComment = event.meta.node.is('comment');

         if(event.meta.node.sameNode(this)) {
             this.detach();
         } else {
         if(event.meta.node.sameNode(this)) {
             this.detach();
         } else {


@@ -127,12 +152,19 @@ $.extend(generic, {
                     return true;
                 }
             });
                     return true;
                 }
             });

+            if(isComment && !this.wlxmlNode.hasChild({klass: 'comment'})) {
+                this.commentTip.hide();
+            }
+            this.commentsView.render();

         }
     },
     onNodeTextChange: function(event) {
         }
     },
     onNodeTextChange: function(event) {

-        var toSet = event.meta.node.getText();
-        this.children().some(function(child) {
-            if(child.wlxmlNode.sameNode(event.meta.node)) {
+        var node = event.meta.node,
+            toSet = node.getText(),
+            handled;
+        
+        handled = this.children().some(function(child) {
+            if(child.wlxmlNode.sameNode(node)) {

                 if(toSet === '') {
                     toSet = utils.unicode.ZWS;
                 }
                 if(toSet === '') {
                     toSet = utils.unicode.ZWS;
                 }


@@ -142,6 +174,10 @@ $.extend(generic, {
                 return true;
             }
         });
                 return true;
             }
         });

+
+        if(!handled && node.parent() && node.parent().is('comment') && this.wlxmlNode.sameNode(node.parent().parent())) {
+            this.commentsView.render();
+        }

     },
 
     onStateChange: function(changes) {
     },
 
     onStateChange: function(changes) {


@@ -180,8 +216,10 @@ $.extend(generic, {
         } else {
             element = this.canvas.createElement(param);
         }
         } else {
             element = this.canvas.createElement(param);
         }

-        this._container().prepend(element.dom);
-        this.refreshPath();
+        if(element.dom) {
+            this._container().prepend(element.dom);
+            this.refreshPath();
+        }

         return element;
     },
 
         return element;
     },