diff --git a/node_modules/ace/lib/ace/ext/static_highlight.js b/node_modules/ace/lib/ace/ext/static_highlight.js index 2acb3ac5..fc1928fc 100644 --- a/node_modules/ace/lib/ace/ext/static_highlight.js +++ b/node_modules/ace/lib/ace/ext/static_highlight.js @@ -187,5 +187,5 @@ highlight.renderSync = function(input, mode, theme, lineStart, disableGutter) { }; module.exports = highlight; -module.exports.highlight =highlight; +module.exports.highlight = highlight; }); diff --git a/node_modules/ace/lib/ace/worker/worker_client.js b/node_modules/ace/lib/ace/worker/worker_client.js index b69071fb..42c08f43 100644 --- a/node_modules/ace/lib/ace/worker/worker_client.js +++ b/node_modules/ace/lib/ace/worker/worker_client.js @@ -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; } diff --git a/package.json b/package.json index 94124f08..b0ca1544 100644 --- a/package.json +++ b/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. ", "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", diff --git a/plugins/c9.fs/fs.errors.js b/plugins/c9.fs/fs.errors.js index 595c05e7..299814a0 100644 --- a/plugins/c9.fs/fs.errors.js +++ b/plugins/c9.fs/fs.errors.js @@ -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]; diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-blue.png b/plugins/c9.ide.layout.classic/images/c9-logo-blue.png deleted file mode 100644 index c2ec1291..00000000 Binary files a/plugins/c9.ide.layout.classic/images/c9-logo-blue.png and /dev/null differ diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-blue@2x.png b/plugins/c9.ide.layout.classic/images/c9-logo-blue@2x.png deleted file mode 100644 index 914e9494..00000000 Binary files a/plugins/c9.ide.layout.classic/images/c9-logo-blue@2x.png and /dev/null differ diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-white.png b/plugins/c9.ide.layout.classic/images/c9-logo-white.png deleted file mode 100644 index 298bbe76..00000000 Binary files a/plugins/c9.ide.layout.classic/images/c9-logo-white.png and /dev/null differ diff --git a/plugins/c9.ide.layout.classic/images/c9-logo-white@2x.png b/plugins/c9.ide.layout.classic/images/c9-logo-white@2x.png deleted file mode 100644 index 038ac529..00000000 Binary files a/plugins/c9.ide.layout.classic/images/c9-logo-white@2x.png and /dev/null differ diff --git a/plugins/c9.ide.layout.classic/less/splitter.less b/plugins/c9.ide.layout.classic/less/splitter.less index 928f487c..466d46d5 100644 --- a/plugins/c9.ide.layout.classic/less/splitter.less +++ b/plugins/c9.ide.layout.classic/less/splitter.less @@ -1,6 +1,6 @@ .splitter { position : relative; - z-index : 10000; + z-index : 100000; .box-sizing(border-box); } diff --git a/plugins/c9.ide.layout.classic/loading-flat.css b/plugins/c9.ide.layout.classic/loading-flat.css deleted file mode 100644 index d0751103..00000000 --- a/plugins/c9.ide.layout.classic/loading-flat.css +++ /dev/null @@ -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; -} \ No newline at end of file diff --git a/plugins/c9.ide.layout.classic/loading-classic.css b/plugins/c9.ide.layout.classic/loading.css similarity index 100% rename from plugins/c9.ide.layout.classic/loading-classic.css rename to plugins/c9.ide.layout.classic/loading.css diff --git a/plugins/c9.ide.terminal/terminal.js b/plugins/c9.ide.terminal/terminal.js index 0e7fd763..9ae0d835 100644 --- a/plugins/c9.ide.terminal/terminal.js +++ b/plugins/c9.ide.terminal/terminal.js @@ -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(); diff --git a/plugins/c9.static/cdn.cli.js b/plugins/c9.static/cdn.cli.js index d0e33fa0..8f4f51c5 100644 --- a/plugins/c9.static/cdn.cli.js +++ b/plugins/c9.static/cdn.cli.js @@ -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]) { diff --git a/plugins/c9.vfs.standalone/standalone.js b/plugins/c9.vfs.standalone/standalone.js index dff3feca..06ab4a35 100644 --- a/plugins/c9.vfs.standalone/standalone.js +++ b/plugins/c9.vfs.standalone/standalone.js @@ -130,7 +130,7 @@ function plugin(options, imports, register) { pid: 1 }; req.session = {}; - next(); + api.authenticate()(req, res, next); }, previewHandler.getProxyUrl(function() { return { diff --git a/plugins/c9.vfs.standalone/views/standalone.html.ejs b/plugins/c9.vfs.standalone/views/standalone.html.ejs index 8d6f4761..008507a3 100644 --- a/plugins/c9.vfs.standalone/views/standalone.html.ejs +++ b/plugins/c9.vfs.standalone/views/standalone.html.ejs @@ -16,11 +16,39 @@ window.isLocalVersion = nRequire ? true : false; window.require = undefined; + - <% include ../../c9.ide.server/views/load-screen.ejs %> +
+
+
+ Loading your workspace +
+
+
It will be just as you left it
+ +
+
+ +
+
+
+
+ Documentation | + Server Status | + Support +
+
+ + <% if (packed) { %> @@ -30,7 +58,7 @@ <% } %>