X-Git-Url: https://git.mdrn.pl/fnpeditor.git/blobdiff_plain/22e9258db6c11e6e0b042e142836cdb21399cc7b..af9ccdd1815aea5d1489b9729287bea85519b74f:/src/editor/modules/documentCanvas/canvas/documentElement.js diff --git a/src/editor/modules/documentCanvas/canvas/documentElement.js b/src/editor/modules/documentCanvas/canvas/documentElement.js index afa510f..5a40f30 100644 --- a/src/editor/modules/documentCanvas/canvas/documentElement.js +++ b/src/editor/modules/documentCanvas/canvas/documentElement.js @@ -57,9 +57,6 @@ $.extend(DocumentElement.prototype, { getVerticallyFirstTextElement: function() { var toret; this.children().some(function(child) { - if(!child.isVisible()) { - return false; // continue - } if(child instanceof DocumentTextElement) { toret = child; return true; // break @@ -87,16 +84,6 @@ $.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) { if(this.manager && this.manager[method]) { return this.manager[method].apply(this.manager, Array.prototype.slice.call(arguments, 1)); @@ -141,7 +128,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()); @@ -202,14 +191,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'); @@ -228,31 +210,9 @@ $.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() { this.manager = wlxmlManagers.getFor(this); this.manager.setup(); }, - is: function(what) { - if(what === 'list' && _.contains(['list.items', 'list.items.enum'], this.getWlxmlClass())) { - return true; - } - return false; - }, toggleLabel: function(toggle) { var displayCss = toggle ? 'inline-block' : 'none'; var label = this.dom().children('.canvas-widgets').find('.canvas-widget-label');