X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/7a3c737d962ff2b2e2653fd8ed0108e92c7fe0d5..274b8289ef222d2641b124b6f9c55c63b27af7bb:/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 89ffce9..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,117 +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)]
- };
- },
- toXML: function(level) {
- var node = $('<' + this.getWlxmlTag() + '>');
-
- if(this.getWlxmlClass())
- node.attr('class', this.getWlxmlClass());
- var meta = this.getWlxmlMetaAttrs();
- meta.forEach(function(attr) {
- if(attr.value)
- node.attr('meta-' + attr.name, attr.value);
- });
- _.keys(this.data('other-attrs') || {}).forEach(function(key) {
- node.attr(key, this.data('other-attrs')[key]);
- }, this);
-
- var addFormatting = function() {
- var toret = $('
');
- var formattings = {};
-
- if(this.data('orig-before') !== undefined) {
- if(this.data('orig-before')) {
- toret.prepend(document.createTextNode(this.data('orig-before')));
- }
- } else if(level && this.getWlxmlTag() !== 'span') {
- toret.append('\n' + (new Array(level * 2 + 1)).join(' '));
- }
-
- toret.append(node);
-
- if(this.data('orig-after')) {
- toret.append(document.createTextNode(this.data('orig-after')));
- }
-
- /* Inside node */
- if(this.data('orig-begin')) {
- node.prepend(this.data('orig-begin'));
- formattings.begin = true;
- }
-
- if(this.data('orig-end') !== undefined) {
- if(this.data('orig-end')) {
- node.append(this.data('orig-end'));
- }
- } else if(this.getWlxmlTag() !== 'span' && children.length){
- node.append('\n' + (new Array(level * 2 + 1)).join(' '));
- }
-
- return {parts: toret.contents(), formattings: formattings};
- }.bind(this);
-
-
-
- var children = this.children(),
- childParts;
-
- var formatting = addFormatting(node);
-
- for(var i = children.length - 1; i >= 0; i--) {
- childParts = children[i].toXML(level + 1);
- if(typeof childParts === 'string')
- childParts = [document.createTextNode(childParts)];
-
- if(formatting.formattings.begin) {
- $(node.contents()[0]).after(childParts);
- } else
- node.prepend(childParts);
- }
- return formatting.parts;
- },
append: function(params) {
if(params.tag !== 'span')
this.data('orig-end', undefined);
@@ -403,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
@@ -435,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');
@@ -503,9 +356,6 @@ $.extend(DocumentTextElement, {
DocumentTextElement.prototype = new DocumentElement();
$.extend(DocumentTextElement.prototype, {
- toXML: function(parent) {
- return this.getText();
- },
_setupDOMHandler: function(htmlElement) {
var $element = $(htmlElement);
if(htmlElement.nodeType === Node.TEXT_NODE)
@@ -546,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('
');
this.dom().parent().after(element.dom());
@@ -567,84 +417,7 @@ $.extend(DocumentTextElement.prototype, {
this.dom().unwrap();
return element;
},
- wrapWithNodeElement: function(wlxmlNode) {
- if(typeof wlxmlNode.start === 'number' && typeof wlxmlNode.end === 'number') {
- return this.canvas.wrapText({
- inside: this.parent(),
- textNodeIdx: this.parent().childIndex(this),
- 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() {
- var parent = this.parent(),
- toret;
- if(parent.children().length === 1) {
- toret = parent.parent();
- var grandParent = parent.parent();
- if(grandParent) {
- var grandParentChildren = grandParent.children(),
- idx = grandParent.childIndex(parent),
- prev = idx - 1 > -1 ? grandParentChildren[idx-1] : null,
- next = idx + 1 < grandParentChildren.length ? grandParentChildren[idx+1] : null;
-
- prev = (prev instanceof DocumentTextElement) ? prev : null;
- next = (next instanceof DocumentTextElement) ? next : null;
-
- if(prev && next) {
- prev.setText(prev.getText() + this.getText() + next.getText());
- next.detach();
- } else if (prev || next) {
- var target = prev ? prev : next,
- newText = prev ? target.getText() + this.getText() : this.getText() + target.getText();
- target.setText(newText);
- } else {
- parent.after(this);
- }
- } else {
- parent.after(this);
- }
- parent.detach();
- return toret;
- }
- },
- split: function(params) {
- var parentElement = this.parent(),
- myIdx = parentElement.childIndex(this),
- myCanvas = this.canvas,
- passed = false,
- succeedingChildren = [],
- thisElement = this,
- prefix = this.getText().substr(0, params.offset),
- suffix = this.getText().substr(params.offset);
-
- parentElement.children().forEach(function(child) {
- if(passed)
- succeedingChildren.push(child);
- if(child.sameNode(thisElement))
- passed = true;
- });
-
- if(prefix.length > 0)
- this.setText(prefix);
- else
- this.detach();
-
- var newElement = DocumentNodeElement.create({tag: parentElement.getWlxmlTag(), klass: parentElement.getWlxmlClass()}, myCanvas);
- parentElement.after(newElement);
-
- if(suffix.length > 0)
- newElement.append({text: suffix});
- succeedingChildren.forEach(function(child) {
- newElement.append(child);
- });
- return {first: parentElement, second: newElement};
- },
divide: function(params) {
var myText = this.getText();