From bf404a740c73d3aa8df7a44ef47012f33933e624 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Aleksander=20=C5=81ukasz?= Date: Fri, 22 Nov 2013 13:04:40 +0100 Subject: [PATCH 1/1] integration wip: removing unused serialization code --- .../modules/documentCanvas/canvas/canvas.js | 7 -- .../documentCanvas/canvas/documentElement.js | 71 ------------------- .../modules/documentCanvas/documentCanvas.js | 3 - 3 files changed, 81 deletions(-) diff --git a/src/editor/modules/documentCanvas/canvas/canvas.js b/src/editor/modules/documentCanvas/canvas/canvas.js index 48f03de..c72d886 100644 --- a/src/editor/modules/documentCanvas/canvas/canvas.js +++ b/src/editor/modules/documentCanvas/canvas/canvas.js @@ -316,13 +316,6 @@ $.extend(Canvas.prototype, { setCursorPosition: function(position) { if(position.element) this._moveCaretToTextElement(position.element, position.offset); - }, - - toXML: function() { - var parent = $('
'), - parts = this.doc().toXML(0); - parent.append(parts); - return parent.html(); } }); diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js index 89ffce9..d624112 100644 --- a/src/editor/modules/documentCanvas/canvas/documentElement.js +++ b/src/editor/modules/documentCanvas/canvas/documentElement.js @@ -267,74 +267,6 @@ $.extend(DocumentNodeElement.prototype, { 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); @@ -503,9 +435,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) diff --git a/src/editor/modules/documentCanvas/documentCanvas.js b/src/editor/modules/documentCanvas/documentCanvas.js index 6331922..aa38e79 100644 --- a/src/editor/modules/documentCanvas/documentCanvas.js +++ b/src/editor/modules/documentCanvas/documentCanvas.js @@ -42,9 +42,6 @@ return function(sandbox) { canvas.loadWlxmlDocument(wlxmlDocument); canvasWrapper.find('#rng-module-documentCanvas-content').empty().append(canvas.view()); }, - getDocument: function() { - return canvas.toXML(); - }, modifyCurrentNodeElement: function(attr, value) { var currentNodeElement = canvas.getCurrentNodeElement(); if(attr === 'class' || attr === 'tag') { -- 2.20.1