From f6aff0c5d6c2c5ac1815149697e8f60f1a178e54 Mon Sep 17 00:00:00 2001
From: Renato De Donato <renato@isislab01.isis.lab>
Date: Thu, 26 Nov 2015 17:05:27 +0100
Subject: [PATCH] loader
---
controllets/dataset-selection-controllet/dataset-selection-controllet.html | 13 +++++++------
datalets/base-datalet/static/js/WorkcycleBehavior.js | 3 ++-
2 files changed, 9 insertions(+), 7 deletions(-)
diff --git a/controllets/dataset-selection-controllet/dataset-selection-controllet.html b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
index bd7dafd..c50b75b 100755
--- a/controllets/dataset-selection-controllet/dataset-selection-controllet.html
+++ b/controllets/dataset-selection-controllet/dataset-selection-controllet.html
@@ -144,7 +144,7 @@
}
#div_datasetexplorer {
- padding-top: 48px;
+ /*padding-top: 48px;*/
}
</style>
@@ -206,10 +206,10 @@
</neon-animatable>
<neon-animatable>
- <div id="div_datasetexplorer">
- <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>
+ <div id="div_datasetexplorer"></div>
+ <!--<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>-->
<!--<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>-->
- </div>
+ <!--</div>-->
</neon-animatable>
<neon-animatable>
@@ -269,6 +269,7 @@
},
ready : function(){
+ $(this.$.material_container).perfectScrollbar();
$(this.$.dialog_info).perfectScrollbar();
},
@@ -301,8 +302,8 @@
},
_loadTreeMap : function(){
-// if(this.selected == 0 && this.$.div_datasetexplorer.innerHTML == "")
-// 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>";
+ if(this.selected != 1 && this.$.div_datasetexplorer.innerHTML == "")
+ 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>";
},
_selectDataUrl_treeMap : function(e){
diff --git a/datalets/base-datalet/static/js/WorkcycleBehavior.js b/datalets/base-datalet/static/js/WorkcycleBehavior.js
index c308e7f..ccd91f5 100755
--- a/datalets/base-datalet/static/js/WorkcycleBehavior.js
+++ b/datalets/base-datalet/static/js/WorkcycleBehavior.js
@@ -2,7 +2,7 @@
@license
The MIT License (MIT)
- Copyright (c) 2015 Dipartimento di Informatica - Universit� di Salerno - Italy
+ Copyright (c) 2015 Dipartimento di Informatica - Universit� di Salerno - Italy
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
@@ -101,6 +101,7 @@ var WorkcycleBehavior = {
if(this._component.data === undefined || this._component.data == ""){
this.requestData();
}else{
+ this.deleteWaitImage();
this.data = JSON.parse(this._component.data);
this.transformData();
this.presentData();
--
libgit2 0.21.4