X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/22a990585c518e18de8fd2b023145d6ac305a6fa..f098ff9873de73d1fd6d71ce64b83ae318e8bd7e:/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 5ed3d20..27160e7 100644 --- a/src/editor/modules/documentCanvas/canvas/documentElement.js +++ b/src/editor/modules/documentCanvas/canvas/documentElement.js @@ -11,9 +11,6 @@ define([ // DocumentElement represents a text or an element node from WLXML document rendered inside Canvas var DocumentElement = function(wlxmlNode, canvas) { - if(arguments.length === 0) { - return; - } this.wlxmlNode = wlxmlNode; this.canvas = canvas; @@ -28,14 +25,6 @@ $.extend(DocumentElement.prototype, { dom: function() { return this.$element; }, - data: function() { - var dom = this.dom(), - args = Array.prototype.slice.call(arguments, 0); - if(args.length === 2 && args[1] === undefined) { - return dom.removeData(args[0]); - } - return dom.data.apply(dom, arguments); - }, parent: function() { var parents = this.$element.parents('[document-node-element]'); if(parents.length) { @@ -58,16 +47,9 @@ $.extend(DocumentElement.prototype, { return other && (typeof other === typeof this) && other.dom()[0] === this.dom()[0]; }, - markAsCurrent: function() { - this.canvas.markAsCurrent(this); - }, - getVerticallyFirstTextElement: function() { var toret; this.children().some(function(child) { - if(!child.isVisible()) { - return false; // continue - } if(child instanceof DocumentTextElement) { toret = child; return true; // break @@ -95,20 +77,9 @@ $.extend(DocumentElement.prototype, { return this.canvas.getDocumentElement(utils.nearestInDocumentOrder(selector, direction, this.dom()[0])); }, - isVisible: function() { - return this instanceof DocumentTextElement || this.getWlxmlTag() !== 'metadata'; - }, - - isInsideList: function() { - return this.parents().some(function(parent) { - return parent.is('list'); - }); - }, - exec: function(method) { - var manager = this.data('_wlxmlManager'); - if(manager[method]) { - return manager[method].apply(manager, Array.prototype.slice.call(arguments, 1)); + if(this.manager && this.manager[method]) { + return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1)); } } }); @@ -133,7 +104,7 @@ var manipulate = function(e, params, action) { return element; }; -DocumentNodeElement.prototype = new DocumentElement(); +DocumentNodeElement.prototype = Object.create(DocumentElement.prototype); $.extend(DocumentNodeElement.prototype, { @@ -150,7 +121,9 @@ $.extend(DocumentNodeElement.prototype, { // Make sure widgets aren't navigable with arrow keys widgetsContainer.find('*').add(widgetsContainer).attr('tabindex', -1); this.$element = dom; //@!!! - this.setWlxml({tag: this.wlxmlNode.getTagName(), klass: this.wlxmlNode.getClass()}); + + this.setWlxmlTag(this.wlxmlNode.getTagName()); + this.setWlxmlClass(this.wlxmlNode.getClass()); this.wlxmlNode.contents().forEach(function(node) { container.append(this.canvas.createElement(node).dom()); @@ -211,14 +184,7 @@ $.extend(DocumentNodeElement.prototype, { return this._container().attr('wlxml-tag'); }, setWlxmlTag: function(tag) { - if(tag === this.getWlxmlTag()) { - return; - } - this._container().attr('wlxml-tag', tag); - if(!this.__updatingWlxml) { - this._updateWlxmlManager(); - } }, getWlxmlClass: function() { var klass = this._container().attr('wlxml-class'); @@ -237,31 +203,8 @@ $.extend(DocumentNodeElement.prototype, { else { this._container().removeAttr('wlxml-class'); } - if(!this.__updatingWlxml) { - this._updateWlxmlManager(); - } - }, - setWlxml: function(params) { - this.__updatingWlxml = true; - if(params.tag !== undefined) { - this.setWlxmlTag(params.tag); - } - if(params.klass !== undefined) { - this.setWlxmlClass(params.klass); - } - this._updateWlxmlManager(); - this.__updatingWlxml = false; - }, - _updateWlxmlManager: function() { - var manager = wlxmlManagers.getFor(this); - this.data('_wlxmlManager', manager); - manager.setup(); - }, - is: function(what) { - if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass())) { - return true; - } - return false; + this.manager = wlxmlManagers.getFor(this); + this.manager.setup(); }, toggleLabel: function(toggle) { var displayCss = toggle ? 'inline-block' : 'none'; @@ -275,9 +218,8 @@ $.extend(DocumentNodeElement.prototype, { }, toggle: function(toggle) { - var mng = this.data('_wlxmlManager'); - if(mng) { - mng.toggle(toggle); + if(this.manager) { + this.manager.toggle(toggle); } } }); @@ -294,7 +236,7 @@ $.extend(DocumentTextElement, { } }); -DocumentTextElement.prototype = new DocumentElement(); +DocumentTextElement.prototype = Object.create(DocumentElement.prototype); $.extend(DocumentTextElement.prototype, { createDOM: function() {