smartxml: minor refactoring to improve clarity

[fnpeditor.git] / src / editor / modules / documentCanvas / canvas / elementsRegister.js

diff --git a/src/editor/modules/documentCanvas/canvas/elementsRegister.js b/src/editor/modules/documentCanvas/canvas/elementsRegister.js
index 0d31c7d..24a700a 100644 (file)
--- a/src/editor/modules/documentCanvas/canvas/elementsRegister.js
+++ b/src/editor/modules/documentCanvas/canvas/elementsRegister.js
@@ -5,27 +5,18 @@ var _ = require('libs/underscore'),
     wlxml = require('wlxml/wlxml');
 
 
     wlxml = require('wlxml/wlxml');
 
 

-var ElementsRegister = function(basePrototype, defaultPrototype) {
+var ElementsRegister = function(BaseType) {

     this._register = {};
     this._register = {};

-    this.basePrototype = basePrototype;
-    this.DefaultType = this.createCanvasElementType(defaultPrototype);
+    this.BaseType = BaseType;

 };
 
 _.extend(ElementsRegister.prototype, {
 };
 
 _.extend(ElementsRegister.prototype, {

-    createCanvasElementType: function(elementPrototype, extending) {
-        var inheritFrom = this.basePrototype;
-        if(extending && extending.tag) {
-            inheritFrom = this.getElement(extending);
-        }
+    createCanvasElementType: function(elementPrototype) {
+        var register = this;

         var Constructor = function() {
         var Constructor = function() {

-            if(!this.super) {
-                this.super = inheritFrom.prototype;
-            }
-            inheritFrom.apply(this, Array.prototype.slice.call(arguments, 0));
-            
+            register.BaseType.apply(this, Array.prototype.slice.call(arguments, 0));

         };
         };

-        Constructor.prototype = Object.create(inheritFrom.prototype);
-        _.extend(Constructor.prototype, elementPrototype);
+        Constructor.prototype = elementPrototype;

         return Constructor;
     },
     register: function(params) {
         return Constructor;
     },
     register: function(params) {


@@ -33,7 +24,7 @@ _.extend(ElementsRegister.prototype, {
         params.prototype = params.prototype || Object.create({});
 
         this._register[params.tag] = this._register[params.tag] || {};
         params.prototype = params.prototype || Object.create({});
 
         this._register[params.tag] = this._register[params.tag] || {};

-        this._register[params.tag][params.klass] = this.createCanvasElementType(params.prototype, params.extending);
+        this._register[params.tag][params.klass] = this.createCanvasElementType(params.prototype);

     },
     getElement: function(params) {
         params.klass = params.klass || '';
     },
     getElement: function(params) {
         params.klass = params.klass || '';


@@ -47,7 +38,7 @@ _.extend(ElementsRegister.prototype, {
             }.bind(this));
         }
         if(!Factory) {
             }.bind(this));
         }
         if(!Factory) {

-            Factory = this.DefaultType;
+            Factory = this.BaseType;

         }
         return Factory;
     }
         }
         return Factory;
     }