X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/bf404a740c73d3aa8df7a44ef47012f33933e624..0fac4e30a7e7e0cfe2f25a7f8dffbbfcccf8383c:/src/editor/modules/documentCanvas/canvas/documentElement.js?ds=sidebyside diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js index d624112..1c0719f 100644 --- a/src/editor/modules/documentCanvas/canvas/documentElement.js +++ b/src/editor/modules/documentCanvas/canvas/documentElement.js @@ -1,11 +1,10 @@ define([ 'libs/jquery', 'libs/underscore', -'modules/documentCanvas/classAttributes', 'modules/documentCanvas/canvas/utils', 'modules/documentCanvas/canvas/widgets', 'modules/documentCanvas/canvas/wlxmlManagers' -], function($, _, classAttributes, utils, widgets, wlxmlManagers) { +], function($, _, utils, widgets, wlxmlManagers) { 'use strict'; @@ -80,13 +79,6 @@ $.extend(DocumentElement.prototype, { return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0]; }, - wrapWithNodeElement: function(wlxmlNode) { - var wrapper = DocumentNodeElement.create({tag: wlxmlNode.tag, klass: wlxmlNode.klass}, this); - this.dom().replaceWith(wrapper.dom()); - wrapper.append(this); - return wrapper; - }, - markAsCurrent: function() { this.canvas.markAsCurrent(this); }, @@ -174,10 +166,6 @@ $.extend(DocumentNodeElement, { element.setWlxml({tag: wlxmlNode.getTagName(), klass: wlxmlNode.getClass()}); - _.keys(wlxmlNode.getMetaAttributes()).forEach(function(key) { - element.setWlxmlMetaAttr(key, params.meta[key]); - }); - wlxmlNode.contents().forEach((function(node) { container.append(DocumentElement.create(node).dom()); }).bind(this)); @@ -224,49 +212,6 @@ $.extend(DocumentNodeElement.prototype, { this.canvas = null; return this; }, - unwrapContents: function() { - var parent = this.parent(); - if(!parent) - return; - - var parentChildren = parent.children(), - myChildren = this.children(), - myIdx = parent.childIndex(this); - - if(myChildren.length === 0) - return this.detach(); - - var moveLeftRange, moveRightRange, leftMerged; - - if(myIdx > 0 && (parentChildren[myIdx-1] instanceof DocumentTextElement) && (myChildren[0] instanceof DocumentTextElement)) { - parentChildren[myIdx-1].appendText(myChildren[0].getText()); - myChildren[0].detach(); - moveLeftRange = true; - leftMerged = true; - } else { - leftMerged = false; - } - - if(!(leftMerged && myChildren.length === 1)) { - if(myIdx < parentChildren.length - 1 && (parentChildren[myIdx+1] instanceof DocumentTextElement) && (myChildren[myChildren.length-1] instanceof DocumentTextElement)) { - parentChildren[myIdx+1].prependText(myChildren[myChildren.length-1].getText()); - myChildren[myChildren.length-1].detach(); - moveRightRange = true; - } - } - - var childrenLength = this.children().length; - this.children().forEach(function(child) { - this.before(child); - }.bind(this)); - - this.detach(); - - return { - element1: parent.children()[myIdx + (moveLeftRange ? -1 : 0)], - element2: parent.children()[myIdx + childrenLength-1 + (moveRightRange ? 1 : 0)] - }; - }, append: function(params) { if(params.tag !== 'span') this.data('orig-end', undefined); @@ -335,12 +280,6 @@ $.extend(DocumentNodeElement.prototype, { setWlxmlClass: function(klass) { if(klass === this.getWlxmlClass()) return; - - this.getWlxmlMetaAttrs().forEach(function(attr) { - if(!classAttributes.hasMetaAttr(klass, attr.name)) - this.dom().removeAttr('wlxml-meta-' + attr.name); - }, this); - if(klass) this._container().attr('wlxml-class', klass.replace(/\./g, '-')); else @@ -367,24 +306,6 @@ $.extend(DocumentNodeElement.prototype, { return true; return false; }, - - getWlxmlMetaAttr: function(attr) { - return this.dom().attr('wlxml-meta-'+attr); - }, - - getWlxmlMetaAttrs: function() { - var toret = []; - var attrList = classAttributes.getMetaAttrsList(this.getWlxmlClass()); - attrList.all.forEach(function(attr) { - toret.push({name: attr.name, value: this.getWlxmlMetaAttr(attr.name) || ''}); - }, this); - return toret; - }, - - setWlxmlMetaAttr: function(attr, value) { - this.dom().attr('wlxml-meta-'+attr, value); - }, - toggleLabel: function(toggle) { var displayCss = toggle ? 'inline-block' : 'none'; var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label'); @@ -475,7 +396,7 @@ $.extend(DocumentTextElement.prototype, { if(params instanceof DocumentNodeElement) { element = params; } else { - element = DocumentNodeElement.create(params, this.canvas); + element = DocumentElement.create(params, this.canvas); } this.dom().wrap('