From 2546c9dabe14b77b9e97c81efb2403eb93e9f79d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 22 Nov 2013 16:03:58 +0100 Subject: [PATCH 1/1] integration wip: removing unused code in documentCanvas module --- .../modules/documentCanvas/canvas/canvas.js | 93 ------------- .../documentCanvas/canvas/documentElement.js | 127 ------------------ 2 files changed, 220 deletions(-) diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js index c72d886..9a01457 100644 --- a/src/editor/modules/documentCanvas/canvas/canvas.js +++ b/src/editor/modules/documentCanvas/canvas/canvas.js @@ -121,99 +121,6 @@ $.extend(Canvas.prototype, { return documentElement.DocumentNodeElement.create(params, this); }, - wrapText: function(params) { - params = _.extend({textNodeIdx: 0}, params); - if(typeof params.textNodeIdx === 'number') - params.textNodeIdx = [params.textNodeIdx]; - - var childrenInside = params.inside.children(), - idx1 = Math.min.apply(Math, params.textNodeIdx), - idx2 = Math.max.apply(Math, params.textNodeIdx), - textNode1 = childrenInside[idx1], - textNode2 = childrenInside[idx2], - sameNode = textNode1.sameNode(textNode2), - prefixOutside = textNode1.getText().substr(0, params.offsetStart), - prefixInside = textNode1.getText().substr(params.offsetStart), - suffixInside = textNode2.getText().substr(0, params.offsetEnd), - suffixOutside = textNode2.getText().substr(params.offsetEnd) - ; - - var wrapperElement = this.createNodeElement({tag: params._with.tag, klass: params._with.klass}); - textNode1.after(wrapperElement); - textNode1.detach(); - - if(prefixOutside.length > 0) - wrapperElement.before({text:prefixOutside}); - if(sameNode) { - var core = textNode1.getText().substr(params.offsetStart, params.offsetEnd - params.offsetStart); - wrapperElement.append({text: core}); - } else { - textNode2.detach(); - if(prefixInside.length > 0) - wrapperElement.append({text: prefixInside}); - for(var i = idx1 + 1; i < idx2; i++) { - wrapperElement.append(childrenInside[i]); - } - if(suffixInside.length > 0) - wrapperElement.append({text: suffixInside}); - } - if(suffixOutside.length > 0) - wrapperElement.after({text: suffixOutside}); - return wrapperElement; - }, - - wrapElements: function(params) { - if(!(params.element1.parent().sameNode(params.element2.parent()))) - return; - - var parent = params.element1.parent(), - parentChildren = parent.children(), - wrapper = this.createNodeElement({ - tag: params._with.tag, - klass: params._with.klass}), - idx1 = parent.childIndex(params.element1), - idx2 = parent.childIndex(params.element2); - - if(idx1 > idx2) { - var tmp = idx1; - idx1 = idx2; - idx2 = tmp; - } - - var insertingMethod, insertingTarget; - if(idx1 === 0) { - insertingMethod = 'prepend'; - insertingTarget = parent; - } else { - insertingMethod = 'after'; - insertingTarget = parentChildren[idx1-1]; - } - - for(var i = idx1; i <= idx2; i++) { - wrapper.append(parentChildren[i].detach()); - } - - insertingTarget[insertingMethod](wrapper); - return wrapper; - }, - - getSiblingParents: function(params) { - var parents1 = [params.element1].concat(params.element1.parents()).reverse(), - parents2 = [params.element2].concat(params.element2.parents()).reverse(), - noSiblingParents = null; - - if(parents1.length === 0 || parents2.length === 0 || !(parents1[0].sameNode(parents2[0]))) - return noSiblingParents; - - var i; - for(i = 0; i < Math.min(parents1.length, parents2.length); i++) { - if(parents1[i].sameNode(parents2[i])) - continue; - break; - } - return {element1: parents1[i], element2: parents2[i]}; - }, - getDocumentElement: function(from) { if(from instanceof HTMLElement || from instanceof Text) { return documentElement.DocumentElement.fromHTMLElement(from, this); diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js index 4951e6c..116ebf4 100644 --- a/src/editor/modules/documentCanvas/canvas/documentElement.js +++ b/src/editor/modules/documentCanvas/canvas/documentElement.js @@ -79,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); }, @@ -219,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); @@ -467,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(); -- 2.20.1