Skip to content

Commit 958f240

Browse files
committed
* fix loading indicator style
1 parent 1bd005d commit 958f240

2 files changed

Lines changed: 17 additions & 6 deletions

File tree

plugins-client/ext.main/style/loading.css

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,16 @@
3131
margin: 0 auto;
3232
top: 35%;
3333
}
34+
#loadingide .loading-progress #progress-msg {
35+
position: relative;
36+
width: 190px;
37+
margin: 0 auto;
38+
}
39+
#loadingide .loading-progress #progress-msg span {
40+
position: absolute;
41+
left: 191px;
42+
top: 0;
43+
}
3444
#loadingide .loading-msg {
3545
color: #909090;
3646
}

plugins-server/cloud9.core/view/ide.tmpl.html

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -36,12 +36,13 @@
3636
msg = msg.replace(/"/g, "&quot;").replace(/'/g, "&#8217;").replace(/</g, "&lt;");
3737
var header = '<div class="header"></div>';
3838
var footer = '<div class="footer"><a href="https://docs.c9.io">Documentation</a> | <a href="https://status.c9.io">Server Status</a> | <a href="http://support.cloud9ide.com">Support</a>';
39-
loadingIde.innerHTML = header + '<div class="loading-progress"><div id="progress-msg">Preparing your workspace .</div><div class="loading-seperator"></div><div class="loading-msg">' + msg + '</div></div>' + footer;
39+
loadingIde.innerHTML = header + '<div class="loading-progress"><div id="progress-msg">Preparing your workspace <span> .</span></div><div class="loading-seperator"></div><div class="loading-msg">' + msg + '</div></div>' + footer;
4040
document.body.appendChild(loadingIde);
4141
var progressInterval = setInterval(function () {
4242
var progressMsg = document.getElementById("progress-msg");
4343
if (!progressMsg)
4444
return clearInterval(progressInterval);
45+
progressMsg = progressMsg.getElementsByTagName('span')[0];
4546
var parts = progressMsg.innerHTML.split(" ");
4647
var dots = parts[parts.length-1];
4748
parts[parts.length-1] = dots.length === 3 ? "." : (dots + ".");
@@ -112,20 +113,20 @@
112113
else {
113114
var apfLoc = "";
114115
}
115-
116+
116117
var config = <%requirejsConfig%>;
117118

118119
require(config, [apfLoc], function(){
119120

120121
if (!cloud9config.packed) {
121-
var list = ["core/ide", "core/ext", "core/util",
122+
var list = ["core/ide", "core/ext", "core/util",
122123
"core/settings", "ext/main/main", "ext/editors/editors",
123124
"ace/editor"];
124125
}
125126
else {
126127
var list = ["[%staticUrl%]/" + (cloud9config.packedName.length > 0 ? cloud9config.packedName : "c9os.min.js")];
127128
}
128-
129+
129130
require(list, function(ide, ext, util){
130131
if (!cloud9config.packed) {
131132
var plugins = <%plugins%>;
@@ -149,7 +150,7 @@
149150
aceConfig.set("modePath", "[%staticUrl%]/ace/mode");
150151
aceConfig.set("themePath", "[%staticUrl%]/ace/theme");
151152
aceConfig.set("suffix", ".js?staticUrl=" + cloud9config.staticUrl);
152-
153+
153154
//Load extensions
154155
if (!cloud9config.packed) {
155156
apf.addEventListener("load", function(){
@@ -174,7 +175,7 @@
174175
ide.dispatchEvent("extload", {modules: plugins});
175176

176177
cloud9config.totalTime = new Date() - cloud9config.startdate;
177-
console.log("Total Load Time "
178+
console.log("Total Load Time "
178179
+ (cloud9config.totalTime) + "ms");
179180

180181
clearSplash();

0 commit comments

Comments
 (0)