Bugfix parameters

src/core.js

@@ -28,11 +28,13 @@ function core(){
             for(let i=0;i<par.targets.length;i++)
             {
             const transformFactory = new TransformsFactory();
-            const selector = ((par.targets[i]).tagName).toLowerCase();
+            const selector = (par.targets[i]).tagName;
+            const value = (par.targets[i]).getAttribute("val");
+            par.value = value;
             // Provera da li selector odgovara listi selektora za taj code
             if(par.checkSelector(selector))
             {
-                const transform = transformFactory.produce(par.code, par.targets[i]);
+                const transform = transformFactory.produce(par.code, par.targets[i], par.value);
                 transforms.push(transform);
             }
             }

src/parameters/border-color-parameter.js

@@ -1,10 +0,0 @@
-import { Param } from "./parameter";
-export class BorderColorParam extends Param 
-{
-    constructor(){
-        super();
-        this.code = "br-bordercolor";
-        this.selectors = ["table","div"];
-    }
-}
-

src/parameters/color-parameter.js

@@ -1,9 +0,0 @@
-import { Param } from "./parameter";
-
-export class ColorParam extends Param {
-    constructor() {
-        super();
-        this.code = "br-color",
-        this.selectors = ["h1", "h4", "p"];
-    }
-}

src/parameters/hide-parameter.js

@@ -1,9 +0,0 @@
-import { Param } from "./parameter";
-export class HideParam extends Param 
-{
-    constructor(){
-        super();
-        this.code = "br-hide";
-        this.selectors = ["table","p","span"];
-    }
-}

src/parameters/parameter.js

@@ -1,16 +1,19 @@
 
 export class Param 
 {
-    constructor()
+    constructor(code,selectors)
     {
-        this.code = "";
-        this.selectors = [];
+        this.code = code;
+        this.selectors = selectors;
         this.targets = [];
         this.value = null;
     }
     // Check for selector exists in array of selectors
     // If exists return true, else return false
     checkSelector(selector) {
-        return (this.selectors.indexOf(selector) > -1);
+        return (this.selectors.indexOf(selector.toLowerCase()) > -1);
+    }
+    calculateValue(value){
+        this.value = value;
     }
 }

src/parameters/parameters.js

@@ -1,23 +1,17 @@
-import { BorderColorParam } from "./border-color-parameter";
-import { ColorParam } from "./color-parameter";
-import { HideParam } from "./hide-parameter";
-import { RemoveColumnParam } from "./remove-column-parameter";
-import { RemoveHeaderParam } from "./remove-header-parameter";
-import { RemoveRowParam } from "./remove-row-parameter";
-import { ShowNumberRowsParam } from "./show-number-rows-parameters";
-import { SizeParam } from "./size-parameter";
+import { Param } from "./parameter";
+
 
 const parameters = () =>
 {
     return [
-        new BorderColorParam(),
-        new ColorParam(),
-        new HideParam(),
-        new RemoveColumnParam(),
-        new RemoveHeaderParam(),
-        new RemoveRowParam(),
-        new ShowNumberRowsParam(),
-        new SizeParam()
+        new Param("br-size",["p","span"]),
+        new Param("br-shownumberrows",["table"]),
+        new Param("br-removerow",["table"]),
+        new Param("br-removeheader",["table"]),
+        new Param("br-removecolumn",["table"]),
+        new Param("br-hide",["table","p","span"]),
+        new Param("br-color",["h1","p","h4"]),
+        new Param("br-bordercolor",["table","div"])
     ];
 }
 

src/parameters/remove-column-parameter.js

@@ -1,10 +0,0 @@
-import { Param } from "./parameter";
-export class RemoveColumnParam extends Param 
-{
-    constructor(){
-        super();
-        this.code = "br-removecolumn-1";
-        this.selectors = ["table"];
-        this.value = +(this.code.split('-')[2]);        
-    }
-}

src/parameters/remove-header-parameter.js

@@ -1,9 +0,0 @@
-import { Param } from "./parameter";
-export class RemoveHeaderParam extends Param 
-{
-    constructor(){
-        super();
-        this.code = "br-removeheader";
-        this.selectors = ["table"];
-    }
-}

src/parameters/remove-row-parameter.js

@@ -1,10 +0,0 @@
-import { Param } from "./parameter";
-export class RemoveRowParam extends Param 
-{
-    constructor(){
-        super();
-        this.code = "br-removerow-1";
-        this.selectors = ["table"];
-        this.value = +(this.code.split('-')[2]);
-    }
-}

src/parameters/show-number-rows-parameters.js

@@ -1,10 +0,0 @@
-import { Param } from "./parameter";
-export class ShowNumberRowsParam extends Param 
-{
-    constructor(){
-        super();
-        this.code = "br-shownumberrows-4";
-        this.selectors = ["table"];
-        this.value = +(this.code.split('-')[2]);
-    }
-}

src/parameters/size-parameter.js

@@ -1,10 +0,0 @@
-import { Param } from "./parameter";
-export class SizeParam extends Param 
-{
-    constructor(){
-        super();
-        this.code = "br-size-15";
-        this.selectors = ["p","span"];
-        this.value = +(this.code.split('-')[2]);
-    }
-}

src/transformations/remove-table-column-transform.js

@@ -3,18 +3,18 @@ import $ from 'jquery';
 
 export class RemoveTableColumnTransform extends Transform
 {
-    constructor(selector,column)
+    constructor(object,column)
     {
         super();
-        this.selector = selector;
+        this.object = object;
         this.column = column;
     }
     execute(){
         const column = this.column;
-        $(`${this.selector} > tbody > tr`).each(function () {
+        $(`${this.object} > tbody > tr`).each(function () {
             $(this).find('td').eq(column).remove();
         });
-        $(`${this.selector} > thead > tr`).each(function () {
+        $(`${this.object} > thead > tr`).each(function () {
             $(this).find('th').eq(column).remove();
         });
     };

src/transforms-factory.js

@@ -7,10 +7,8 @@ import { ShowNumberRowsTransformation } from "./transformations/show-number-rows
 import { BorderColorTransform } from "./transformations/border-color-transformation/border-color-transformation";
 
 export class TransformsFactory{
-    produce(code,object)
+    produce(code,object,value)
     {
-        const arrayCode = code.split('-');
-        code = `${arrayCode[0]}-${arrayCode[1]}`;
         if(code == null){
             return null;
          }		
@@ -20,13 +18,13 @@ export class TransformsFactory{
          } else if(code === ("br-color")){
             return new ColorTransform(object);
          } else if(code === ("br-removecolumn")){
-            return new RemoveTableColumnTransform(object,arrayCode[2]);
+            return new RemoveTableColumnTransform(object,value);
          } else if(code === ("br-removerow")){
-            return new RemoveTableRowTransform(`${object} > tbody`,arrayCode[2]);
+            return new RemoveTableRowTransform(`${object} > tbody`,value);
          } else if(code === ("br-removeheader")){
             return new RemoveTableRowTransform(`${object} > thead`,0);
          } else if(code === ("br-shownumberrows")){
-            return new ShowNumberRowsTransformation(object,arrayCode[2]);
+            return new ShowNumberRowsTransformation(object,value);
          } else if(code === ("br-bordercolor")){
             return new BorderColorTransform(object);
         }