SGH / COMPONENTS

Commit d19b8d743b76430de8186fa688fa0308d037bbb7

Authored by lucvic
1 parent 73cc8795

Removed loading spinner (moved in base-ajax-json-jsonpath-datalet)

Inline Side-by-side
Showing 3 changed files with 2 additions and 5 deletions
datalets/datasetexplorer-datalet/datasetexplorer-datalet.html
  View file @d19b8d7
@@ -30,6 +30,7 @@ @@ -30,6 +30,7 @@
30 --> 30 -->
31 31
32 <link rel="import" href="../base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html"> 32 <link rel="import" href="../base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html">
  33 +<link rel="import" href="../base-ajax-json-jsonpath-datalet/base-ajax-json-jsonpath-datalet.html">
33 34
34 <!-- 35 <!--
35 36
@@ -120,11 +121,10 @@ Example: @@ -120,11 +121,10 @@ Example:
120 121
121 } 122 }
122 </style> 123 </style>
123 - <div id="treemap_placeholder"><img class="spinner" src="spin.svg" /></div> 124 + <div id="treemap_placeholder"></div>
124 <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet> 125 <base-ajax-json-jsonpath-datalet data-url="{{dataUrl}}" fields="{{fields}}" data="{{data}}"></base-ajax-json-jsonpath-datalet>
125 </template> 126 </template>
126 127
127 - <!--<script src="../shared_js/d3.js"></script>-->  
128 <script src="../shared_js/d3.js"></script> 128 <script src="../shared_js/d3.js"></script>
129 <script src="js/buildtreemap.js"></script> 129 <script src="js/buildtreemap.js"></script>
130 <script> 130 <script>
datalets/datasetexplorer-datalet/js/buildtreemap.js
  View file @d19b8d7
@@ -28,8 +28,6 @@ function build(root, place_holder, select_listener) { @@ -28,8 +28,6 @@ function build(root, place_holder, select_listener) {
28 .ratio(height / width * 0.5 * (1 + Math.sqrt(5))) 28 .ratio(height / width * 0.5 * (1 + Math.sqrt(5)))
29 .round(false); 29 .round(false);
30 30
31 - d3.select("#" + place_holder).selectAll('*').remove();  
32 -  
33 var svg = d3.select("#" + place_holder) 31 var svg = d3.select("#" + place_holder)
34 .append("svg") 32 .append("svg")
35 .attr("width", width + margin.left + margin.right) 33 .attr("width", width + margin.left + margin.right)
datalets/datasetexplorer-datalet/spin.svg deleted
View file @73cc879
1 -<?xml version="1.0" encoding="utf-8"?><svg width='198px' height='198px' xmlns="http://www.w3.org/2000/svg" viewBox="0 0 100 100" preserveAspectRatio="xMidYMid" class="uil-spin"><rect x="0" y="0" width="100" height="100" fill="none" class="bk"></rect><g transform="translate(50 50)"><g transform="rotate(0) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(45) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.12s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.12s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(90) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.25s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.25s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(135) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.37s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.37s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(180) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.5s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.5s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(225) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.62s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.62s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(270) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.75s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.75s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g><g transform="rotate(315) translate(34 0)"><circle cx="0" cy="0" r="8" fill="#1976d2"><animate attributeName="opacity" from="1" to="0.1" begin="0.87s" dur="1s" repeatCount="indefinite"></animate><animateTransform attributeName="transform" type="scale" from="1.5" to="1" begin="0.87s" dur="1s" repeatCount="indefinite"></animateTransform></circle></g></g></svg>  
2 \ No newline at end of file 0 \ No newline at end of file