Commit f6aff0c5d6c2c5ac1815149697e8f60f1a178e54
1 parent
83faae2e
loader
Showing
2 changed files
with
9 additions
and
7 deletions
controllets/dataset-selection-controllet/dataset-selection-controllet.html
... | ... | @@ -144,7 +144,7 @@ |
144 | 144 | } |
145 | 145 | |
146 | 146 | #div_datasetexplorer { |
147 | - padding-top: 48px; | |
147 | + /*padding-top: 48px;*/ | |
148 | 148 | } |
149 | 149 | </style> |
150 | 150 | |
... | ... | @@ -206,10 +206,10 @@ |
206 | 206 | </neon-animatable> |
207 | 207 | |
208 | 208 | <neon-animatable> |
209 | - <div id="div_datasetexplorer"> | |
210 | - <datasetexplorer-datalet class="datasetexplorer" data-url="/openwall/api/datasetTree" fields='["result,provider_name","result,organization_name","result,package_name","result,resource_name","result,url","result,w"]'></datasetexplorer-datalet> | |
209 | + <div id="div_datasetexplorer"></div> | |
210 | + <!--<datasetexplorer-datalet class="datasetexplorer" data-url="/openwall/api/datasetTree" fields='["result,provider_name","result,organization_name","result,package_name","result,resource_name","result,url","result,w"]'></datasetexplorer-datalet>--> | |
211 | 211 | <!--<datasetexplorer-datalet class="datasetexplorer" data-url="/oxwall_x.y.z/openwall/api/datasetTree" fields='["result,provider_name","result,organization_name","result,package_name","result,resource_name","result,url","result,w"]'></datasetexplorer-datalet>--> |
212 | - </div> | |
212 | + <!--</div>--> | |
213 | 213 | </neon-animatable> |
214 | 214 | |
215 | 215 | <neon-animatable> |
... | ... | @@ -269,6 +269,7 @@ |
269 | 269 | }, |
270 | 270 | |
271 | 271 | ready : function(){ |
272 | + $(this.$.material_container).perfectScrollbar(); | |
272 | 273 | $(this.$.dialog_info).perfectScrollbar(); |
273 | 274 | }, |
274 | 275 | |
... | ... | @@ -301,8 +302,8 @@ |
301 | 302 | }, |
302 | 303 | |
303 | 304 | _loadTreeMap : function(){ |
304 | -// if(this.selected == 0 && this.$.div_datasetexplorer.innerHTML == "") | |
305 | -// this.$.div_datasetexplorer.innerHTML = "<datasetexplorer-datalet class=\"datasetexplorer\" data-url=\"/oxwall_x.y.z/openwall/api/datasetTree\" fields='[\"result,provider_name\",\"result,organization_name\",\"result,package_name\",\"result,resource_name\",\"result,url\",\"result,w\"]'></datasetexplorer-datalet>"; | |
305 | + if(this.selected != 1 && this.$.div_datasetexplorer.innerHTML == "") | |
306 | + this.$.div_datasetexplorer.innerHTML = "<datasetexplorer-datalet class=\"datasetexplorer\" data-url=\"/openwall/api/datasetTree\" fields='[\"result,provider_name\",\"result,organization_name\",\"result,package_name\",\"result,resource_name\",\"result,url\",\"result,w\"]'></datasetexplorer-datalet>"; | |
306 | 307 | }, |
307 | 308 | |
308 | 309 | _selectDataUrl_treeMap : function(e){ |
... | ... |
datalets/base-datalet/static/js/WorkcycleBehavior.js
... | ... | @@ -2,7 +2,7 @@ |
2 | 2 | @license |
3 | 3 | The MIT License (MIT) |
4 | 4 | |
5 | - Copyright (c) 2015 Dipartimento di Informatica - Università di Salerno - Italy | |
5 | + Copyright (c) 2015 Dipartimento di Informatica - Universit� di Salerno - Italy | |
6 | 6 | |
7 | 7 | Permission is hereby granted, free of charge, to any person obtaining a copy |
8 | 8 | of this software and associated documentation files (the "Software"), to deal |
... | ... | @@ -101,6 +101,7 @@ var WorkcycleBehavior = { |
101 | 101 | if(this._component.data === undefined || this._component.data == ""){ |
102 | 102 | this.requestData(); |
103 | 103 | }else{ |
104 | + this.deleteWaitImage(); | |
104 | 105 | this.data = JSON.parse(this._component.data); |
105 | 106 | this.transformData(); |
106 | 107 | this.presentData(); |
... | ... |