|
36 | 36 | msg = msg.replace(/"/g, """).replace(/'/g, "’").replace(/</g, "<"); |
37 | 37 | var header = '<div class="header"></div>'; |
38 | 38 | 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; |
40 | 40 | document.body.appendChild(loadingIde); |
41 | 41 | var progressInterval = setInterval(function () { |
42 | 42 | var progressMsg = document.getElementById("progress-msg"); |
43 | 43 | if (!progressMsg) |
44 | 44 | return clearInterval(progressInterval); |
| 45 | + progressMsg = progressMsg.getElementsByTagName('span')[0]; |
45 | 46 | var parts = progressMsg.innerHTML.split(" "); |
46 | 47 | var dots = parts[parts.length-1]; |
47 | 48 | parts[parts.length-1] = dots.length === 3 ? "." : (dots + "."); |
|
112 | 113 | else { |
113 | 114 | var apfLoc = ""; |
114 | 115 | } |
115 | | - |
| 116 | + |
116 | 117 | var config = <%requirejsConfig%>; |
117 | 118 |
|
118 | 119 | require(config, [apfLoc], function(){ |
119 | 120 |
|
120 | 121 | if (!cloud9config.packed) { |
121 | | - var list = ["core/ide", "core/ext", "core/util", |
| 122 | + var list = ["core/ide", "core/ext", "core/util", |
122 | 123 | "core/settings", "ext/main/main", "ext/editors/editors", |
123 | 124 | "ace/editor"]; |
124 | 125 | } |
125 | 126 | else { |
126 | 127 | var list = ["[%staticUrl%]/" + (cloud9config.packedName.length > 0 ? cloud9config.packedName : "c9os.min.js")]; |
127 | 128 | } |
128 | | - |
| 129 | + |
129 | 130 | require(list, function(ide, ext, util){ |
130 | 131 | if (!cloud9config.packed) { |
131 | 132 | var plugins = <%plugins%>; |
|
149 | 150 | aceConfig.set("modePath", "[%staticUrl%]/ace/mode"); |
150 | 151 | aceConfig.set("themePath", "[%staticUrl%]/ace/theme"); |
151 | 152 | aceConfig.set("suffix", ".js?staticUrl=" + cloud9config.staticUrl); |
152 | | - |
| 153 | + |
153 | 154 | //Load extensions |
154 | 155 | if (!cloud9config.packed) { |
155 | 156 | apf.addEventListener("load", function(){ |
|
174 | 175 | ide.dispatchEvent("extload", {modules: plugins}); |
175 | 176 |
|
176 | 177 | cloud9config.totalTime = new Date() - cloud9config.startdate; |
177 | | - console.log("Total Load Time " |
| 178 | + console.log("Total Load Time " |
178 | 179 | + (cloud9config.totalTime) + "ms"); |
179 | 180 |
|
180 | 181 | clearSplash(); |
|
0 commit comments