X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/0b195120fbfdc78b01142167f82dbe8e5670da4b..34ca0e947bbf0afdc520c025daabbe1221d69628:/modules/documentCanvas/canvas/documentElement.js diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js index 0d08aab..0e2cb3d 100644 --- a/modules/documentCanvas/canvas/documentElement.js +++ b/modules/documentCanvas/canvas/documentElement.js @@ -12,61 +12,32 @@ var DocumentElement = function(htmlElement, canvas) { return; this.canvas = canvas; this.$element = $(htmlElement); - - this.wlxmlTag = this.$element.attr('wlxml-tag'); } $.extend(DocumentElement.prototype, { dom: function() { return this.$element; }, - children: function() { - var toret = []; - if(this instanceof DocumentTextElement) - return toret; - - - var elementContent = this.$element.contents(); - var element = this; - elementContent.each(function(idx) { - var childElement = documentElementFromHTMLElement(this, element.canvas); - if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '') - return true; - if(idx > 0 && childElement instanceof DocumentTextElement) { - if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '') - return true; - } - toret.push(childElement); - }); - return toret; - }, parent: function() { - return documentElementFromHTMLElement(this.$element.parent()[0], this.canvas); + var parents = this.$element.parents('[wlxml-tag]'); + if(parents.length) + return documentElementFromHTMLElement(parents[0], this.canvas); + return null; }, sameNode: function(other) { - return other && (typeof other === typeof this) && other.$element[0] === this.$element[0]; + return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0]; }, wrapWithNodeElement: function(wlxmlNode) { - this.$element.wrap($('<' + wlxmlNode.tag + ' class="' + wlxmlNode.klass.replace('.', '-') + '">')[0]); - return documentElementFromHTMLElement(this.$element.parent().get(0), this.canvas); - }, - - childIndex: function(child) { - var children = this.children(), - toret = null; - children.forEach(function(c, idx) { - if(c.sameNode(child)) { - toret = idx; - return false; - } - }); - return toret; + var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass}); + this.dom().replaceWith(wrapper.dom()); + wrapper.append(this); + return wrapper; }, detach: function() { - this.$element.detach(); + this.dom().detach(); this.canvas = null; } }); @@ -90,7 +61,7 @@ var manipulate = function(e, params, action) { } else { dom = DocumentNodeElement.createDOM(params); } - e.$element[action](dom); + e.dom()[action](dom); return documentElementFromHTMLElement(dom); }; @@ -105,11 +76,57 @@ $.extend(DocumentNodeElement.prototype, { after: function(params) { manipulate(this, params, 'after'); }, + children: function() { + var toret = []; + if(this instanceof DocumentTextElement) + return toret; + + + var elementContent = this.dom().contents(); + var element = this; + elementContent.each(function(idx) { + var childElement = documentElementFromHTMLElement(this, element.canvas); + if(idx === 0 && elementContent.length > 1 && elementContent[1].nodeType === Node.ELEMENT_NODE && (childElement instanceof DocumentTextElement) && $.trim($(this).text()) === '') + return true; + if(idx > 0 && childElement instanceof DocumentTextElement) { + if(toret[toret.length-1] instanceof DocumentNodeElement && $.trim($(this).text()) === '') + return true; + } + toret.push(childElement); + }); + return toret; + }, + childIndex: function(child) { + var children = this.children(), + toret = null; + children.forEach(function(c, idx) { + if(c.sameNode(child)) { + toret = idx; + return false; + } + }); + return toret; + }, + getWlxmlTag: function() { + return this.dom().attr('wlxml-tag'); + }, + setWlxmlTag: function(tag) { + this.dom().attr('wlxml-tag', tag); + }, + getWlxmlClass: function() { + var klass = this.dom().attr('wlxml-class'); + if(klass) + return klass.replace('-', '.'); + return undefined; + }, setWlxmlClass: function(klass) { - this.$element.attr('class', klass); + if(klass) + this.dom().attr('wlxml-class', klass); + else + this.dom().removeAttr('wlxml-class'); }, is: function(what) { - if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.$element.attr('wlxml-class'))) + if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.dom().attr('wlxml-class'))) return true; return false; } @@ -135,10 +152,10 @@ DocumentNodeElement.create = function(params, canvas) { $.extend(DocumentTextElement.prototype, { setText: function(text) { - this.$element[0].data = text; + this.dom()[0].data = text; }, getText: function() { - return this.$element.text(); + return this.dom().text(); }, after: function(params) { if(params instanceof DocumentTextElement || params.text) @@ -149,9 +166,9 @@ $.extend(DocumentTextElement.prototype, { } else { dom = DocumentNodeElement.createDOM(params); } - this.$element.wrap('
'); - this.$element.parent().after(dom[0]); - this.$element.unwrap(); + this.dom().wrap('
'); + this.dom().parent().after(dom[0]); + this.dom().unwrap(); return documentElementFromHTMLElement(dom[0]); }, before: function(params) { @@ -163,24 +180,31 @@ $.extend(DocumentTextElement.prototype, { } else { dom = DocumentNodeElement.createDOM(params); } - this.$element.wrap('
'); - this.$element.parent().before(dom[0]); - this.$element.unwrap(); + this.dom().wrap('
'); + this.dom().parent().before(dom[0]); + this.dom().unwrap(); return documentElementFromHTMLElement(dom[0]); }, wrapWithNodeElement: function(wlxmlNode) { - if(wlxmlNode.start && wlxmlNode.end) { + if(typeof wlxmlNode.start === 'number' && typeof wlxmlNode.end === 'number') { return this.canvas.wrapText({ inside: this.parent(), textNodeIdx: this.parent().childIndex(this), - offsetStart: wlxmlNode.start, - offsetEnd: wlxmlNode.end, + offsetStart: Math.min(wlxmlNode.start, wlxmlNode.end), + offsetEnd: Math.max(wlxmlNode.start, wlxmlNode.end), _with: {tag: wlxmlNode.tag, klass: wlxmlNode.klass} }); } else { return DocumentElement.prototype.wrapWithNodeElement.call(this, wlxmlNode); } }, + unwrap: function() { + if(this.parent().children().length === 1) { + var parent = this.parent(); + parent.after(this); + parent.detach(); + } + }, split: function(params) { var parentElement = this.parent(), myIdx = parentElement.childIndex(this), @@ -201,9 +225,9 @@ $.extend(DocumentTextElement.prototype, { if(prefix.length > 0) this.setText(prefix); else - this.remove(); + this.detach(); - var newElement = DocumentNodeElement.create({tag: parentElement.wlxmlTag, klass: parentElement.wlxmlClass}, myCanvas); + var newElement = DocumentNodeElement.create({tag: parentElement.getWlxmlTag(), klass: parentElement.getWlxmlClass()}, myCanvas); parentElement.after(newElement); if(suffix.length > 0)