X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/51a333278c2989a5a0022c19404bd257bf55cb27..f1709cec5b085835c7e5d36eaa2d2b35d0b13f22:/src/editor/modules/documentCanvas/canvas/genericElement.js?ds=inline
diff --git a/src/editor/modules/documentCanvas/canvas/genericElement.js b/src/editor/modules/documentCanvas/canvas/genericElement.js
index bbb4b07..4f4da9b 100644
--- a/src/editor/modules/documentCanvas/canvas/genericElement.js
+++ b/src/editor/modules/documentCanvas/canvas/genericElement.js
@@ -26,8 +26,19 @@ $.extend(generic, {
.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));
+
+ this.commentTip = $('
');
+ this.addWidget(this.commentTip);
+
+ if(!this.wlxmlNode.hasChild({klass: 'comment'})) {
+ this.commentTip.hide();
+ }
+
this.refresh();
},
@@ -93,31 +104,36 @@ $.extend(generic, {
return;
}
- var nodeIndex = event.meta.node.getIndex(),
+ var ptr = event.meta.node.prev(),
referenceElement, referenceAction, actionArg;
+
+ while(ptr && !(referenceElement = utils.getElementForElementRootNode(ptr))) {
+ ptr = ptr.prev();
+ }
- if(nodeIndex === 0) {
+ if(referenceElement) {
+ referenceAction = 'after';
+ } else {
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(actionArg && actionArg.sameNode(referenceElement)) {
- referenceElement = this.children()[nodeIndex];
- }
}
if(!actionArg) {
actionArg = event.meta.node;
}
referenceElement[referenceAction](actionArg);
+
+ if(event.meta.node.is('comment')) {
+ this.commentTip.show();
+ }
},
onNodeDetached: function(event) {
+ var isComment = event.meta.node.is('comment');
if(event.meta.node.sameNode(this)) {
this.detach();
} else {
@@ -127,6 +143,9 @@ $.extend(generic, {
return true;
}
});
+ if(isComment && !this.wlxmlNode.hasChild({klass: 'comment'})) {
+ this.commentTip.hide();
+ }
}
},
onNodeTextChange: function(event) {
@@ -180,8 +199,10 @@ $.extend(generic, {
} 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;
},