X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/58d1e96373dee3849af719bdedb3d57c51adc5c3..723ac1f3c7cd74605ea7103d7738daad92772515:/modules/documentCanvas/canvas/documentElement.js diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js index d82f8e4..d0adbc0 100644 --- a/modules/documentCanvas/canvas/documentElement.js +++ b/modules/documentCanvas/canvas/documentElement.js @@ -1,6 +1,7 @@ define([ -'libs/jquery-1.9.1.min' -], function($) { +'libs/jquery-1.9.1.min', +'libs/underscore-min' +], function($, _) { 'use strict'; @@ -11,10 +12,7 @@ var DocumentElement = function(htmlElement, canvas) { return; this.canvas = canvas; this.$element = $(htmlElement); - - var tagNameProp = this.$element.prop('tagName'); - this.wlxmlTag = tagNameProp ? tagNameProp.toLowerCase() : undefined; -}; +} $.extend(DocumentElement.prototype, { dom: function() { @@ -49,8 +47,10 @@ $.extend(DocumentElement.prototype, { }, wrapWithNodeElement: function(wlxmlNode) { - this.$element.wrap($('<' + wlxmlNode.tag + ' class="' + wlxmlNode.klass + '"">')[0]); - return documentElementFromHTMLElement(this.$element.parent().get(0), this.canvas); + var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass}); + this.$element.replaceWith(wrapper.dom()); + wrapper.append(this); + return wrapper; }, childIndex: function(child) { @@ -104,6 +104,29 @@ $.extend(DocumentNodeElement.prototype, { }, after: function(params) { manipulate(this, params, 'after'); + }, + getWlxmlTag: function() { + return this.$element.attr('wlxml-tag'); + }, + setWlxmlTag: function(tag) { + this.$element.attr('wlxml-tag', tag); + }, + getWlxmlClass: function() { + var klass = this.$element.attr('wlxml-class'); + if(klass) + return klass.replace('-', '.'); + return undefined; + }, + setWlxmlClass: function(klass) { + if(klass) + this.$element.attr('wlxml-class', klass); + else + this.$element.removeAttr('wlxml-class'); + }, + is: function(what) { + if(what === 'list' && _.contains(['list-items', 'list-items-enum'], this.$element.attr('wlxml-class'))) + return true; + return false; } }); @@ -112,9 +135,9 @@ DocumentNodeElement.createDOM = function(params) { if(params.text) { dom = $(document.createTextNode(params.text)); } else { - dom = $('<' + params.tag + '>'); + dom = $('
').attr('wlxml-tag', params.tag); if(params.klass) - dom.attr('class', params.klass); + dom.attr('wlxml-class', params.klass); } return dom; }; @@ -161,18 +184,25 @@ $.extend(DocumentTextElement.prototype, { 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), @@ -193,9 +223,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)