From: Aleksander Łukasz <aleksander.lukasz@nowoczesnapolska.org.pl>
Date: Fri, 12 Jul 2013 14:41:39 +0000 (+0200)
Subject: Getting rid of old wlxmlTag attribute of DocumentElement
X-Git-Url: https://git.mdrn.pl/fnpeditor.git/commitdiff_plain/723ac1f3c7cd74605ea7103d7738daad92772515?ds=sidebyside;hp=13e2b1378fc439299f211939abeb07c732c91566

Getting rid of old wlxmlTag attribute of DocumentElement
---

diff --git a/modules/documentCanvas/canvas/canvas.test3.js b/modules/documentCanvas/canvas/canvas.test3.js
index a4e0c2e..cc2db49 100644
--- a/modules/documentCanvas/canvas/canvas.test3.js
+++ b/modules/documentCanvas/canvas/canvas.test3.js
@@ -68,7 +68,7 @@ describe('Canvas', function() {
 
         it('gives access to its document root node', function() {
             var c = canvas.fromXML('<section></section>');
-            expect(c.doc().wlxmlTag).to.equal('section');
+            expect(c.doc().getWlxmlTag()).to.equal('section');
         });
 
         describe('DocumentTextElement', function() {
@@ -324,10 +324,10 @@ describe('Canvas', function() {
                     var header1 = section.children()[0];
                     var header2 = section.children()[1];
 
-                    expect(header1.wlxmlTag).to.equal('header', 'first section child represents wlxml header');
+                    expect(header1.getWlxmlTag()).to.equal('header', 'first section child represents wlxml header');
                     expect(header1.children().length).to.equal(1, 'first header has one text child');
                     expect(header1.children()[0].getText()).to.equal('Some ', 'first header has correct content');
-                    expect(header2.wlxmlTag).to.equal('header', 'second section child represents wlxml header');
+                    expect(header2.getWlxmlTag()).to.equal('header', 'second section child represents wlxml header');
                     expect(header2.children().length).to.equal(1, 'second header has one text child');
                     expect(header2.children()[0].getText()).to.equal('header', 'second header has correct content');
                 });
@@ -375,19 +375,19 @@ describe('Canvas', function() {
                     
                     var sectionChildren = section.children();
                     expect(sectionChildren.length).to.equal(2, 'Section has two children');
-                    expect(sectionChildren[0].wlxmlTag).to.equal('header', 'First section element is a wlxml header');
-                    expect(sectionChildren[1].wlxmlTag).to.equal('header', 'Second section element is a wlxml header');
+                    expect(sectionChildren[0].getWlxmlTag()).to.equal('header', 'First section element is a wlxml header');
+                    expect(sectionChildren[1].getWlxmlTag()).to.equal('header', 'Second section element is a wlxml header');
 
                     var firstHeaderChildren = sectionChildren[0].children();
                     expect(firstHeaderChildren.length).to.equal(3, 'First header has three children');
                     expect(firstHeaderChildren[0].getText()).to.equal('A ', 'First header starts with a text');
-                    expect(firstHeaderChildren[1].wlxmlTag).to.equal('span', 'First header has span in the middle');
+                    expect(firstHeaderChildren[1].getWlxmlTag()).to.equal('span', 'First header has span in the middle');
                     expect(firstHeaderChildren[2].getText()).to.equal(' a', 'First header ends with text');
 
                     var secondHeaderChildren = sectionChildren[1].children();
                     expect(secondHeaderChildren.length).to.equal(3, 'Second header has three children');
                     expect(secondHeaderChildren[0].getText()).to.equal('nd ', 'Second header starts with text');
-                    expect(secondHeaderChildren[1].wlxmlTag).to.equal('span', 'Second header has span in the middle');
+                    expect(secondHeaderChildren[1].getWlxmlTag()).to.equal('span', 'Second header has span in the middle');
                     expect(secondHeaderChildren[2].getText()).to.equal(' header', 'Second header ends with text');
                 });
             });
diff --git a/modules/documentCanvas/canvas/documentElement.js b/modules/documentCanvas/canvas/documentElement.js
index e805b35..d0adbc0 100644
--- a/modules/documentCanvas/canvas/documentElement.js
+++ b/modules/documentCanvas/canvas/documentElement.js
@@ -12,8 +12,6 @@ var DocumentElement = function(htmlElement, canvas) {
         return;
     this.canvas = canvas;
     this.$element = $(htmlElement);
-
-    this.wlxmlTag = this.$element.attr('wlxml-tag');
 }
 
 $.extend(DocumentElement.prototype, {
@@ -227,7 +225,7 @@ $.extend(DocumentTextElement.prototype, {
         else
             this.detach();
         
-        var newElement = DocumentNodeElement.create({tag: parentElement.wlxmlTag, klass: parentElement.wlxmlClass}, myCanvas);
+        var newElement = DocumentNodeElement.create({tag: parentElement.getWlxmlTag(), klass: parentElement.getWlxmlClass()}, myCanvas);
         parentElement.after(newElement);
 
         if(suffix.length > 0)