diff --git a/controllets/datalet-selection-controllet/datalet-selection-controllet.html b/controllets/datalet-selection-controllet/datalet-selection-controllet.html index 1057212..d253448 100755 --- a/controllets/datalet-selection-controllet/datalet-selection-controllet.html +++ b/controllets/datalet-selection-controllet/datalet-selection-controllet.html @@ -560,18 +560,17 @@ ComponentService.deep_url = this.deepUrl; ComponentService.getComponent(dataletParams); - console.log(this.params); +// console.log(this.params); - //300??? - this.async(function(){ - if(this.$.datalet_selection_datalet_placeholder.children[1]) - this.$.datalet_selection_datalet_placeholder.children[1].behavior.setParameters(this.params); - this.$.add_button.removeAttribute("disabled"); - }, 300); +// this.async(function(){ +// if(this.$.datalet_selection_datalet_placeholder.children[1]) +// this.$.datalet_selection_datalet_placeholder.children[1].behavior.setParameters(this.params); +// this.$.add_button.removeAttribute("disabled"); +// }, 300); // this.async(function(){this.$.add_button.removeAttribute("disabled");}, 300); -// this.$.add_button.removeAttribute("disabled"); + this.$.add_button.removeAttribute("disabled"); }, _addDatalet : function(){ diff --git a/controllets/dataset-selection-controllet/dataset-selection-controllet.html b/controllets/dataset-selection-controllet/dataset-selection-controllet.html index 80e7b2a..47387cf 100755 --- a/controllets/dataset-selection-controllet/dataset-selection-controllet.html +++ b/controllets/dataset-selection-controllet/dataset-selection-controllet.html @@ -281,7 +281,7 @@ var h = $("#material_container").height() - 48; var w = $("#material_container").width(); // /oxwall_x.y.z - this.$.div_datasetexplorer.innerHTML = ""; + this.$.div_datasetexplorer.innerHTML = ""; }, _selectDataUrl_treeMap : function(e) { diff --git a/datalets/areachart-datalet/areachart-datalet.html b/datalets/areachart-datalet/areachart-datalet.html index eef7fcf..1b3717a 100755 --- a/datalets/areachart-datalet/areachart-datalet.html +++ b/datalets/areachart-datalet/areachart-datalet.html @@ -50,7 +50,7 @@ Example: diff --git a/datalets/base-datalet/base-datalet.html b/datalets/base-datalet/base-datalet.html index 030d8e6..4cc3695 100755 --- a/datalets/base-datalet/base-datalet.html +++ b/datalets/base-datalet/base-datalet.html @@ -64,20 +64,15 @@ Example : text-decoration: underline; } #base_datalet_container { - /*display: flex;*/ font-family: 'Roboto', 'Helvetica Neue', Helvetica, Arial, sans-serif; - /*color: #212121;*/ padding-top: 2px; - /*padding: 16px;*/ border-top: 2px solid #B6B6B6; } #base_datalet_rtp { - /*background-color: red;*/ display: flex; padding-top: 4px; } #rtp { - /*width: 152px;*/ padding-top: 8px; padding-right: 8px; font-size: small; @@ -135,20 +130,6 @@ Example : BaseDatalet = Polymer({ is: 'base-datalet', - properties: { - - title : { - type : String, - value : "" - }, - - description : { - type : String, - value : "" - } - - }, - objectDatalet: { /** * It contains the json data from async xhr call returned from core-ajax core component @@ -166,22 +147,6 @@ Example : hideFooter: function() { this.$.base_datalet_container.innerHTML = ""; this.$.base_datalet_container.style.border = 0; - -// this.$.base_datalet_source_link.innerHTML = ""; -// this.$.base_datalet_rtp.innerHTML = ""; - }, - - setFooter: function(title, description) { - this.title = title; - if(title != "" && description != "") - this.description = "- " + description; - else - this.description = description; - - if (this.title == "" && this.description == "") - this.$.base_datalet_title_description.style.display = "none"; - else - this.$.base_datalet_title_description.style.display = "block"; }, /** @@ -195,7 +160,14 @@ Example : * from the entire URL and set the text content of the datalet footer. * @method ready */ + + attached: function(){ + if(this.title != "" && this.description != "") + this.description = "- " + this.description; + }, + ready: function(){ + if(this.dataUrl != undefined) { //cKan organized with or not catalog diff --git a/datalets/base-datalet/static/js/BaseDataletBehavior.js b/datalets/base-datalet/static/js/BaseDataletBehavior.js index 199c9e1..d05a198 100755 --- a/datalets/base-datalet/static/js/BaseDataletBehavior.js +++ b/datalets/base-datalet/static/js/BaseDataletBehavior.js @@ -78,7 +78,8 @@ var BaseDataletBehavior ={ setParameters: function(params) { - $(this._component).find("base-datalet")[0].setFooter(params['title'], params['description']); - }, + this.title = params['title']; + this.description = params['description']; + } }; \ No newline at end of file diff --git a/datalets/bubble3d-datalet/bubble3d-datalet.html b/datalets/bubble3d-datalet/bubble3d-datalet.html index 7553fb5..6e8e38b 100755 --- a/datalets/bubble3d-datalet/bubble3d-datalet.html +++ b/datalets/bubble3d-datalet/bubble3d-datalet.html @@ -59,7 +59,7 @@ Examples: diff --git a/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html b/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html index d58203d..6f0d1a8 100755 --- a/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html +++ b/datalets/donutpie3dchart-datalet/donutpie3dchart-datalet.html @@ -49,7 +49,7 @@ Example: --> @@ -82,6 +82,7 @@ Example : type: String, value: "line"//spline,time } + }, /** * Normalizes a number in agreement with javascript's conventions. Delete all NaN characters. Exception: number representing lat & long remain unchanged. @@ -137,7 +138,8 @@ Example : setParameters: function(params) { - $(this._component).find("base-datalet")[0].setFooter(params['title'], params['description']); + this._component.title = params['title']; + this._component.description = params['description']; var chart = $(this._component.$.charts.$.container).highcharts(); @@ -149,7 +151,8 @@ Example : return this.x + '

' + this.series.name + ': ' + this.y + ' ' + params['suffix'] + ''; } - }, + } + }; var HighchartsComponentBehavior = $.extend(true, {}, BaseDataletBehavior, WorkcycleBehavior, AjaxJsonJsonPathBehavior, HighchartsBehavior); diff --git a/datalets/leafletjs-datalet/leafletjs-datalet.html b/datalets/leafletjs-datalet/leafletjs-datalet.html index 3510663..106b6bb 100755 --- a/datalets/leafletjs-datalet/leafletjs-datalet.html +++ b/datalets/leafletjs-datalet/leafletjs-datalet.html @@ -56,7 +56,7 @@ Example:
- + diff --git a/datalets/linechart-datalet/linechart-datalet.html b/datalets/linechart-datalet/linechart-datalet.html index c5fe4d5..5e9ed9e 100755 --- a/datalets/linechart-datalet/linechart-datalet.html +++ b/datalets/linechart-datalet/linechart-datalet.html @@ -50,7 +50,7 @@ Example: