diff --git a/controllets/paper-card-controllet/paper-card-controllet.html b/controllets/paper-card-controllet/paper-card-controllet.html index aa6d740..45df6eb 100644 --- a/controllets/paper-card-controllet/paper-card-controllet.html +++ b/controllets/paper-card-controllet/paper-card-controllet.html @@ -44,7 +44,6 @@ position: absolute; right: 10px; bottom: -18px; - z-index: 10; --paper-fab-background:#2196F3; } diff --git a/datalets/barchart-datalet/barchart-datalet.html b/datalets/barchart-datalet/barchart-datalet.html index 97379d7..b6f8900 100755 --- a/datalets/barchart-datalet/barchart-datalet.html +++ b/datalets/barchart-datalet/barchart-datalet.html @@ -165,6 +165,17 @@ Example: suffix : { type : String, value : "units" + }, + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} } }, @@ -176,8 +187,8 @@ Example: */ ready: function(){ - var BarchartComponentBehavior = $.extend(true, {}, HighchartsComponentBehavior, BarchartBehavior); - BarchartComponentBehavior.init(this); + this.behavior = $.extend(true, {}, HighchartsComponentBehavior, BarchartBehavior); + this.behavior.init(this); } }); diff --git a/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js b/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js index 93163ca..5aff92f 100755 --- a/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js +++ b/datalets/base-ajax-json-jsonpath-datalet/static/js/AjaxJsonJsonPathBehavior.js @@ -103,7 +103,6 @@ var AjaxJsonJsonPathBehavior = { //Deal the fields with "'" char //this._component.fields = this._component.fields.replace(/#/g,"'"); - this._component.fields = JSON.parse(this._component.fields); for(var i=0;i < this._component.fields.length; i++){ diff --git a/datalets/column3Dchart-datalet/column3Dchart-datalet.html b/datalets/column3Dchart-datalet/column3Dchart-datalet.html index 7ee4378..dcdd2f1 100755 --- a/datalets/column3Dchart-datalet/column3Dchart-datalet.html +++ b/datalets/column3Dchart-datalet/column3Dchart-datalet.html @@ -165,6 +165,17 @@ Example: title: { type: String, value: "Heading" + }, + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} } }, @@ -175,9 +186,8 @@ Example: * @method ready */ ready: function(){ - - var column3DchartComponentBehavior = $.extend(true, {}, HighchartsComponentBehavior, column3DchartBehavior); - column3DchartComponentBehavior.init(this); + this.behavior = $.extend(true, {}, HighchartsComponentBehavior, column3DchartBehavior); + this.behavior.init(this); } }); diff --git a/datalets/columnchart-datalet/columnchart-datalet.html b/datalets/columnchart-datalet/columnchart-datalet.html index 5730311..fc6436a 100755 --- a/datalets/columnchart-datalet/columnchart-datalet.html +++ b/datalets/columnchart-datalet/columnchart-datalet.html @@ -164,6 +164,17 @@ Example: suffix : { type : String, value : "units" + }, + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} } }, @@ -174,8 +185,8 @@ Example: * @method ready */ ready: function(){ - var ColumnchartComponentBehavior = $.extend(true, {}, HighchartsComponentBehavior, ColumnchartBehavior); - ColumnchartComponentBehavior.init(this); + this.behavior = $.extend(true, {}, HighchartsComponentBehavior, ColumnchartBehavior); + this.behavior.init(this); } }); diff --git a/datalets/datatable-datalet/datatable-datalet.html b/datalets/datatable-datalet/datatable-datalet.html index 85a2c5b..82501cf 100755 --- a/datalets/datatable-datalet/datatable-datalet.html +++ b/datalets/datatable-datalet/datatable-datalet.html @@ -96,12 +96,27 @@ Example: Polymer({ is : 'datatable-datalet' , + + properties: { + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} + } + }, + ready: function(){ - var DatatableComponentBehavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, DatatableBehavior); - DatatableComponentBehavior.init(this); + this.behavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, DatatableBehavior); + this.behavior.init(this); } - }); + diff --git a/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html b/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html index d88064b..5e8ef85 100755 --- a/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html +++ b/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html @@ -70,7 +70,6 @@ Example: DonutPie3DSeries[0].data.push(DonutPie3DArr); } - var titleDataset = ""; //Build Highchart element $(this._component.$.charts.$.container).highcharts({ chart: { @@ -114,10 +113,24 @@ Example: } }; - var DonutPiechartComponentBehavior = $.extend(true, {}, HighchartsComponentBehavior, DonutPiechartBehavior); DonutPiechartDatalet = Polymer({ is: 'donutpie3dchart-datalet', + + properties: { + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} + } + }, + /** * 'ready' callback extend the DonutPiechartComponentBehavior with HighchartsComponentBehavior and DonutPiechartBehavior * and run the Datalet workcycle. @@ -125,7 +138,8 @@ Example: * @method ready */ ready: function(){ - DonutPiechartComponentBehavior.init(this); + this.behavior = $.extend(true, {}, HighchartsComponentBehavior, DonutPiechartBehavior); + this.behavior.init(this); } }); diff --git a/datalets/leafletjs-datalet/leafletjs-datalet.html b/datalets/leafletjs-datalet/leafletjs-datalet.html index d4bff2c..58a8eac 100755 --- a/datalets/leafletjs-datalet/leafletjs-datalet.html +++ b/datalets/leafletjs-datalet/leafletjs-datalet.html @@ -108,7 +108,6 @@ Example: is : 'leafletjs-datalet', properties : { - /** * Store a reference to the leafletjs map object created in 'ready' callback * @attribute map @@ -119,7 +118,6 @@ Example: type: Object, value:null }, - /** * An Array with all the markers extracted from the dataset * @attribute markers @@ -129,6 +127,17 @@ Example: { type : Array, value : [] + }, + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} } }, @@ -150,8 +159,8 @@ Example: L.Icon.Default.imagePath = 'http://services.routetopa.eu/DEEalerProvider/COMPONENTS/datalets/leafletjs-datalet/leafletsjs/images'; - var leafletjsComponentBehavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, leafletjsBehavior); - leafletjsComponentBehavior.init(this); + this.behavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, leafletjsBehavior); + this.behavior.init(this); } }); diff --git a/datalets/linechart-datalet/linechart-datalet.html b/datalets/linechart-datalet/linechart-datalet.html index f6c4d2d..f3cf85a 100755 --- a/datalets/linechart-datalet/linechart-datalet.html +++ b/datalets/linechart-datalet/linechart-datalet.html @@ -156,6 +156,17 @@ Example: suffix : { type : String, value : "units" + }, + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} } }, @@ -166,8 +177,8 @@ Example: * @method ready */ ready: function(){ - var LinechartComponentBehavior = $.extend(true, {}, HighchartsComponentBehavior, LinechartBehavior); - LinechartComponentBehavior.init(this); + this.behavior = $.extend(true, {}, HighchartsComponentBehavior, LinechartBehavior); + this.behavior.init(this); } }); diff --git a/datalets/treemap-datalet/treemap-datalet.html b/datalets/treemap-datalet/treemap-datalet.html index da38868..f0a5f79 100755 --- a/datalets/treemap-datalet/treemap-datalet.html +++ b/datalets/treemap-datalet/treemap-datalet.html @@ -197,12 +197,23 @@ Example: name: { type: String, value: "" + }, + /** + * It's the component behavior + * + * @attribute behavior + * @type Object + * @default {} + */ + behavior : { + type : Object, + value : {} } }, ready: function(){ - var TreemapComponentBehavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, TreemapBehavior); - TreemapComponentBehavior.init(this); + this.behavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, TreemapBehavior); + this.behavior.init(this); } });