Skip to content

Commit ff2c37b

Browse files
authored
Merge pull request #22 from iDataVisualizationLab/General
Update transition
2 parents 4116161 + 95fd590 commit ff2c37b

File tree

7 files changed

+92
-151
lines changed

7 files changed

+92
-151
lines changed

.idea/workspace.xml

+64-148
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

css/main.css

+21
Original file line numberDiff line numberDiff line change
@@ -107,3 +107,24 @@ tr:last-child td:last-child { border-bottom-right-radius: 10px; }
107107
stroke-width: 1;
108108
}
109109

110+
/* ------------- Spinner ------------ */
111+
#loading {
112+
width: 100%;
113+
height: 100%;
114+
top: 0;
115+
left: 0;
116+
position: fixed;
117+
display: block;
118+
/*opacity: 0.7;*/
119+
background-color: #fff;
120+
z-index: 99;
121+
text-align: center;
122+
}
123+
124+
#loading-image {
125+
transition: all 0.8s;
126+
position: absolute;
127+
top: 100px;
128+
left: 480px;
129+
z-index: 100;
130+
}

images/spinnerEvent.gif

2.46 MB
Loading

images/spinnerResource.gif

2.1 MB
Loading

index.html

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
<div class="header">
1515
<a>Earthquake Situational Analytics</a>
1616
</div>
17+
<div id="loading">
18+
<img id="loading-image" height="130" width="150"
19+
src="images/spinnerResource.gif" alt="Loading..."/>
20+
</div>
1721
<div id="mainContent"></div>
1822
<script src="js/source.js"></script>
1923
<script src="lib/wordstream.js"></script>

js/main.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ function loadData(){
8888
.style("opacity", 0);
8989
current = initTimestamp;
9090
updateWindow(current);
91-
91+
d3.select('#loading').remove();
9292
}
9393
});
9494
}

js/source.js

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)