kopia lustrzana https://github.com/c9/core
Merge branch 'master' of github.com:c9/newclient into feature/scm
Conflicts: plugins/c9.ide.server/views/flat-load-screen.html plugins/c9.ide.server/views/load-screen.ejspull/223/head
Ruben Daniels
commit
44332321fd
|
|
@ -187,5 +187,5 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) {
|
|||
};
|
||||
|
||||
module.exports = highlight;
|
||||
module.exports.highlight =highlight;
|
||||
module.exports.highlight = highlight;
|
||||
});
|
||||
|
|
|
|||
|
|
@ -68,7 +68,9 @@ var WorkerClient = function(topLevelNamespaces, mod, classname, workerUrl) {
|
|||
var blobURL = URL.createObjectURL(blob);
|
||||
|
||||
this.$worker = new Worker(blobURL);
|
||||
URL.revokeObjectURL(blobURL);
|
||||
setTimeout(function() { // IE EDGE needs a timeout here
|
||||
URL.revokeObjectURL(blobURL);
|
||||
});
|
||||
} else {
|
||||
throw e;
|
||||
}
|
||||
|
|
|
|||
12
package.json
12
package.json
|
|
@ -1,7 +1,7 @@
|
|||
{
|
||||
"name": "c9",
|
||||
"description": "New Cloud9 Client",
|
||||
"version": "3.1.425",
|
||||
"version": "3.1.455",
|
||||
"author": "Ajax.org B.V. <info@ajax.org>",
|
||||
"private": true,
|
||||
"main": "bin/c9",
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
"c9.ide.local": "#a6e689e33b",
|
||||
"c9.ide.find": "#35379124ca",
|
||||
"c9.ide.find.infiles": "#c3bf17286d",
|
||||
"c9.ide.find.replace": "#44772dd796",
|
||||
"c9.ide.find.replace": "#8cbce45290",
|
||||
"c9.ide.run.debug": "#8e081d7471",
|
||||
"c9.automate": "#47e2c429c9",
|
||||
"c9.ide.ace.emmet": "#6dc4585e02",
|
||||
|
|
@ -94,9 +94,9 @@
|
|||
"c9.ide.navigate": "#eff70f4eae",
|
||||
"c9.ide.newresource": "#981a408a7b",
|
||||
"c9.ide.openfiles": "#7fa4a97fed",
|
||||
"c9.ide.preview": "#1a8f86f7d2",
|
||||
"c9.ide.preview": "#ed31957d33",
|
||||
"c9.ide.preview.browser": "#cec211a76a",
|
||||
"c9.ide.preview.markdown": "#8ed82f1197",
|
||||
"c9.ide.preview.markdown": "#bc846e1562",
|
||||
"c9.ide.pubsub": "#a85fb27eca",
|
||||
"c9.ide.readonly": "#e67bb593bd",
|
||||
"c9.ide.recentfiles": "#7c099abf40",
|
||||
|
|
@ -104,9 +104,9 @@
|
|||
"c9.ide.processlist": "#2b12cd1bdd",
|
||||
"c9.ide.run": "#c0b6677da6",
|
||||
"c9.ide.run.build": "#0598fff697",
|
||||
"c9.ide.run.debug.xdebug": "#c4d852533c",
|
||||
"c9.ide.run.debug.xdebug": "#5c004d2d75",
|
||||
"c9.ide.save": "#5118b30230",
|
||||
"c9.ide.scm": "#e0c8c86ac2",
|
||||
"c9.ide.scm": "#af6f2a8055",
|
||||
"c9.ide.terminal.monitor": "#35afa7f97f",
|
||||
"c9.ide.test": "#520fa1e6c5",
|
||||
"c9.ide.test.mocha": "#7844e1dc83",
|
||||
|
|
|
|||
|
|
@ -51,6 +51,7 @@ define(function(require, exports, module) {
|
|||
"ENOTDIR" : "{Totype|type} {to|filename} is not a directory",
|
||||
"EEXIST" : "{Totype|type} {to|filename} already exists",
|
||||
"EACCES" : "Access denied acccessing this {type}",
|
||||
"ENOSPC" : "Your disk is full. Please create more space. Could not write {filename}",
|
||||
"EDISCONNECT" : "The connection went away. Please try again.",
|
||||
"ENOTCONNECTED" : "You are disconnected. "
|
||||
+ "Please check your connection and try again"
|
||||
|
|
@ -81,6 +82,7 @@ define(function(require, exports, module) {
|
|||
|
||||
fs.on("userError", function(e) {
|
||||
if (!m[e.name]) return;
|
||||
if (e.error.code == "EEXIST") return;
|
||||
|
||||
var args = e.args;
|
||||
var path = args[0];
|
||||
|
|
|
|||
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 20 KiB |
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 86 KiB |
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 19 KiB |
Plik binarny nie jest wyświetlany.
|
Przed Szerokość: | Wysokość: | Rozmiar: 37 KiB |
|
|
@ -1,6 +1,6 @@
|
|||
.splitter {
|
||||
position : relative;
|
||||
z-index : 10000;
|
||||
z-index : 100000;
|
||||
.box-sizing(border-box);
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -1,150 +0,0 @@
|
|||
HTML.loading{
|
||||
background: -moz-linear-gradient(top, rgba(255,255,255,1) 0%, rgba(251,251,251,1) 100%); /* FF3.6-15 */
|
||||
background: -webkit-linear-gradient(top, rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* Chrome10-25,Safari5.1-6 */
|
||||
background: linear-gradient(to bottom, rgba(255,255,255,1) 0%,rgba(251,251,251,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
|
||||
}
|
||||
HTML.loading.dark{
|
||||
background: -moz-linear-gradient(top, rgba(37,37,37,1) 0%, rgba(35,35,35,1) 100%); /* FF3.6-15 */
|
||||
background: -webkit-linear-gradient(top, rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* Chrome10-25,Safari5.1-6 */
|
||||
background: linear-gradient(to bottom, rgba(37,37,37,1) 0%,rgba(35,35,35,1) 100%); /* W3C, IE10+, FF16+, Chrome26+, Opera12+, Safari7+ */
|
||||
}
|
||||
|
||||
#loadingide {
|
||||
background-image: url(images/c9-logo-blue.png);
|
||||
background-repeat: no-repeat;
|
||||
background-position: 50% 30%;
|
||||
font-style: normal;
|
||||
height: 100%;
|
||||
width: 100%;
|
||||
position: fixed;
|
||||
text-align: center;
|
||||
z-index: 200000;
|
||||
left: 0;
|
||||
top: 0;
|
||||
-webkit-font-smoothing: antialiased !important;
|
||||
-moz-osx-font-smoothing: grayscale !important;
|
||||
}
|
||||
#loadingide.dark {
|
||||
background-image: url(images/c9-logo-white.png);
|
||||
}
|
||||
|
||||
@media print, (-o-min-device-pixel-ratio: 5/4), (-webkit-min-device-pixel-ratio: 1.25), (min-resolution: 1.25dppx) {
|
||||
#loadingide {
|
||||
background-image: url(images/c9-logo-blue@2x.png);
|
||||
background-size: 300px 279px;
|
||||
}
|
||||
#loadingide.dark {
|
||||
background-image: url(images/c9-logo-white@2x.png);
|
||||
}
|
||||
}
|
||||
|
||||
#loadingide .loading-progress {
|
||||
font-family: Myriad Pro, Arial;
|
||||
font-size: 18px;
|
||||
color: #9b9b9b;
|
||||
height: 37px;
|
||||
position: absolute;
|
||||
margin: 0 auto;
|
||||
bottom: 10%;
|
||||
width: 100%;
|
||||
}
|
||||
#progress-msg {
|
||||
position: relative;
|
||||
width: 250px;
|
||||
margin: 0 auto;
|
||||
}
|
||||
#loadingide .loading-msg {
|
||||
color: #6d6d6d;
|
||||
font-size : 14px;
|
||||
margin-top : 15px;
|
||||
}
|
||||
#loadingide .footer {
|
||||
font-family: "Lucida Sans Unicode", "Lucida Grande", sans-serif;
|
||||
font-size: 11px;
|
||||
color: #333;
|
||||
position:absolute;
|
||||
bottom:5px;
|
||||
right:10px;
|
||||
text-align: right;
|
||||
margin: 0;
|
||||
}
|
||||
#loadingide.dark .footer {
|
||||
color: #818181;
|
||||
}
|
||||
#loadingide .footer,
|
||||
#loadingide .footer > a:link,
|
||||
#loadingide .footer > a:visited,
|
||||
#loadingide .footer > a:active {
|
||||
color: #333;
|
||||
text-decoration: none;
|
||||
}
|
||||
#loadingide.dark .footer,
|
||||
#loadingide.dark .footer > a:link,
|
||||
#loadingide.dark .footer > a:visited,
|
||||
#loadingide.dark .footer > a:active {
|
||||
color: #909090;
|
||||
}
|
||||
#loadingide .footer > a:hover {
|
||||
color: #444;
|
||||
text-decoration: underline;
|
||||
}
|
||||
#loadingide.dark .footer > a:hover {
|
||||
color: #f1f1f1;
|
||||
}
|
||||
#errorMessage {
|
||||
display: block;
|
||||
color: #c41117;
|
||||
text-shadow: 0 1px 0 #eee;
|
||||
background: rgba(255, 0, 0, 0.04);
|
||||
padding: 10px;
|
||||
margin: 50px auto;
|
||||
border-radius: 10px;
|
||||
|
||||
font-size: 15px;
|
||||
text-align: center;
|
||||
width: 560px;
|
||||
line-height: 25px;
|
||||
}
|
||||
#errorMessage a {
|
||||
font-size: 15px;
|
||||
color: #720c10;
|
||||
text-decoration: underline;
|
||||
}
|
||||
|
||||
#loadingide .status {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
margin-left: -100px;
|
||||
width: 200px;
|
||||
text-align: center;
|
||||
top: 57%;
|
||||
margin-top: 200px;
|
||||
}
|
||||
|
||||
#loadingide .cool-message {
|
||||
display: block;
|
||||
font-family: Arial;
|
||||
font-size: 30px;
|
||||
color: #A7A7A7;
|
||||
white-space: nowrap;
|
||||
position: absolute;
|
||||
top: 30%;
|
||||
left: 50%;
|
||||
width: 1000px;
|
||||
text-align: center;
|
||||
margin-left: -500px;
|
||||
margin-top: 250px;
|
||||
}
|
||||
#loadingide.dark .cool-message {
|
||||
color: #757575;
|
||||
}
|
||||
|
||||
#loadingide .spinner {
|
||||
background: url(images/running_flat_light@2x.png);
|
||||
background-size: 300px 20px;
|
||||
animation: rotation 0.6s infinite steps(16);
|
||||
width: 20px;
|
||||
height: 20px;
|
||||
background-repeat: no-repeat;
|
||||
display: inline-block;
|
||||
}
|
||||
|
|
@ -262,7 +262,7 @@ define(function(require, exports, module) {
|
|||
["fontfamily", "Ubuntu Mono, Menlo, Consolas, monospace"], // Monaco,
|
||||
["fontsize", "12"],
|
||||
["blinking", "false"],
|
||||
["scrollback", 10000]
|
||||
["scrollback", 1000]
|
||||
]);
|
||||
|
||||
setSettings();
|
||||
|
|
|
|||
|
|
@ -248,7 +248,7 @@ define(function(require, exports, module) {
|
|||
process.exit(1);
|
||||
}
|
||||
copy(absPath, root + "/static/" + p, {
|
||||
include: /^(libmarkdown.js|runners_list.js|builders_list.js|bootstrap.js)$/,
|
||||
include: /^(remarkable.min.js|runners_list.js|builders_list.js|bootstrap.js)$/,
|
||||
exclude: function(name, dir) {
|
||||
if (/\.css$/.test(name)) {
|
||||
if (!cache.files[dir + "/" + name]) {
|
||||
|
|
|
|||
|
|
@ -130,7 +130,7 @@ function plugin(options, imports, register) {
|
|||
pid: 1
|
||||
};
|
||||
req.session = {};
|
||||
next();
|
||||
api.authenticate()(req, res, next);
|
||||
},
|
||||
previewHandler.getProxyUrl(function() {
|
||||
return {
|
||||
|
|
|
|||
|
|
@ -16,11 +16,39 @@
|
|||
window.isLocalVersion = nRequire ? true : false;
|
||||
window.require = undefined;
|
||||
</script>
|
||||
<link rel="stylesheet" type="text/css" href="/static/plugins/c9.ide.layout.classic/loading.css" />
|
||||
<link rel="shortcut icon" type="image/x-icon" href="favicon.ico" />
|
||||
<link rel="icon" type="image/x-icon" href="favicon.ico" />
|
||||
</head>
|
||||
<body>
|
||||
<% include ../../c9.ide.server/views/load-screen.ejs %>
|
||||
<div id="loadingide">
|
||||
<div id="content" class="loading-progress">
|
||||
<div id="progress-msg">
|
||||
Loading your workspace <span id="dots"></span>
|
||||
</div>
|
||||
<div class="loading-seperator"></div>
|
||||
<div class="loading-msg">It will be just as you left it</div>
|
||||
|
||||
<div class="ui-progress-bar ui-container" id="progress_bar">
|
||||
<div class="ui-progress" style="width: 7%;">
|
||||
<span class="ui-label" style="display:none;"></span>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="footer">
|
||||
<a href="https://docs.c9.io">Documentation</a> |
|
||||
<a href="http://status.c9.io">Server Status</a> |
|
||||
<a href="http://support.c9.io">Support</a>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<script type="text/javascript">
|
||||
var dots = document.getElementById("dots");
|
||||
var cnt = 0;
|
||||
window.dotsAnim = setInterval(function () {
|
||||
dots.textContent = "...".slice(0, (++cnt)%4);
|
||||
}, 500);
|
||||
</script>
|
||||
|
||||
<% if (packed) { %>
|
||||
<script src="/static/<%=version%>/config/<%=configName%>.js"></script>
|
||||
|
|
@ -30,7 +58,7 @@
|
|||
<% } %>
|
||||
<script>
|
||||
var plugins = <%-: architectConfig | JSONToJS %>;
|
||||
var start = Date.now();
|
||||
var start = Date.now();
|
||||
|
||||
<% if (packed) { %>
|
||||
require.MODULE_LOAD_URL = "/static/standalone/modules"
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue