diff --git a/node_modules/architect-build/build_support/mini_require.js b/node_modules/architect-build/build_support/mini_require.js index 03979273..4c4d9b2d 100644 --- a/node_modules/architect-build/build_support/mini_require.js +++ b/node_modules/architect-build/build_support/mini_require.js @@ -148,7 +148,7 @@ var _require = function(parentId, moduleName, callback) { var deps = normalizeNames(parentId, moduleName); var missing = checkMissing(deps); if (!missing.length) { - var args = moduleName.map(lookup); + var args = deps.map(lookup); return callback && callback.apply(null, args); } else { return addToLoadQueue(missing, deps, callback); diff --git a/package.json b/package.json index e1d273b5..d5a00e3b 100644 --- a/package.json +++ b/package.json @@ -54,13 +54,13 @@ "c9.ide.language.generic": "#87a4a44671", "c9.ide.language.html": "#fa4833e117", "c9.ide.language.html.diff": "#a7311cfc9f", - "c9.ide.language.javascript": "#a6f3bec255", + "c9.ide.language.javascript": "#d21ed53af3", "c9.ide.language.javascript.immediate": "#9a2cce9121", - "c9.ide.language.javascript.eslint": "#156062f647", + "c9.ide.language.javascript.eslint": "#cf4b2d05af", "c9.ide.language.javascript.tern": "#a65ad88dd9", "c9.ide.language.javascript.infer": "#702bbd4dcd", "c9.ide.language.jsonalyzer": "#eaf8152b03", - "c9.ide.collab": "#38d942e50a", + "c9.ide.collab": "#afbbc2eddf", "c9.ide.local": "#2bfd7ff051", "c9.ide.find": "#989c06e6a7", "c9.ide.find.infiles": "#28b3cfcb47", @@ -83,7 +83,7 @@ "c9.ide.imgeditor": "#08bbc53578", "c9.ide.immediate": "#e9ba147cc2", "c9.ide.installer": "#24e7d6f399", - "c9.ide.mount": "#c9d598b254", + "c9.ide.mount": "#32e79866ee", "c9.ide.navigate": "#1ff8b463aa", "c9.ide.newresource": "#9a7464cc47", "c9.ide.openfiles": "#28a4f5af16", diff --git a/plugins/c9.cli.bridge/bridge.js b/plugins/c9.cli.bridge/bridge.js index 930710a3..bf39c7bc 100644 --- a/plugins/c9.cli.bridge/bridge.js +++ b/plugins/c9.cli.bridge/bridge.js @@ -14,7 +14,7 @@ define(function(require, exports, module) { var plugin = new Plugin("Ajax.org", main.consumes); var emit = plugin.getEmitter(); - var ENABLED = options.startBridge; + var ENABLED = options.startBridge !== false; var PORT = options.port || 17123; var stream, api; diff --git a/plugins/c9.core/ext.js b/plugins/c9.core/ext.js index cf588ee9..0dcead7a 100644 --- a/plugins/c9.core/ext.js +++ b/plugins/c9.core/ext.js @@ -391,6 +391,8 @@ define(function(require, exports, module) { // } if (!baseclass) { + delete this.baseclass; + delete this.freezePublicAPI.baseclass; delete this.freezePublicAPI; delete this.setAPIKey; delete this.getEmitter; @@ -401,6 +403,7 @@ define(function(require, exports, module) { return this; }; var baseclass; + this.baseclass = this.freezePublicAPI.baseclass = function(){ baseclass = true; }; function getElement(name, callback) { @@ -611,7 +614,7 @@ define(function(require, exports, module) { /***** Register and define API *****/ - this.freezePublicAPI.baseclass(); + this.baseclass(); /** * Base class for all Plugins of Cloud9. A Cloud9 Plugin is diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js index ffb5579f..3eb584ab 100644 --- a/plugins/c9.ide.dialog/dialog.js +++ b/plugins/c9.ide.dialog/dialog.js @@ -74,11 +74,14 @@ define(function(require, module, exports) { var modal = options.modal; var zindex = options.zindex; var allowClose = options.allowClose; - var elements = options.elements; + var elements = options.elements || []; var resizable = options.resizable || false; var widths = options.widths || {}; var count = 0; + if (custom === undefined) + custom = !(body || heading); + var dialog, buttons, titles; var loaded; @@ -148,9 +151,14 @@ define(function(require, module, exports) { buttons = plugin.getElement("buttons"); // Create dynamic UI elements - elements.forEach(function(item) { - createItem(null, null, item); - }); + if (elements.length) { + elements.forEach(function(item) { + createItem(null, null, item); + }); + } + else { + buttons.parentNode.removeChild(buttons); + } emit.sticky("draw", { aml: titles, @@ -175,7 +183,7 @@ define(function(require, module, exports) { implementation(); // Update UI - if (!custom) { + if (!custom && (heading || body)) { titles.$int.innerHTML = "

" + heading + "

" + body + "
"; diff --git a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less index f78fd8a0..b7799839 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark-gray.less @@ -1591,7 +1591,7 @@ @upload-frame-item-color: #e1e1e1; // Mount -@mount-container-padding: 18px 10px 12px 10px; +@mount-container-padding: 8px 0px 2px 0px; @mount-loading-background: rgba(0,0,0,0.5); @mount-loading-color: #f1f1f1; diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less index 26707588..78de4079 100644 --- a/plugins/c9.ide.layout.classic/themes/default-dark.less +++ b/plugins/c9.ide.layout.classic/themes/default-dark.less @@ -1591,7 +1591,7 @@ @upload-frame-item-color: #e1e1e1; // Mount -@mount-container-padding: 18px 10px 12px 10px; +@mount-container-padding: 8px 0px 2px 0px; @mount-loading-background: rgba(0,0,0,0.5); @mount-loading-color: #f1f1f1; diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less index 6425061b..12695989 100644 --- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less @@ -1591,7 +1591,7 @@ @upload-frame-item-color: #333; // Mount -@mount-container-padding: 20px; +@mount-container-padding: 5px 0 0 0; @mount-loading-background: rgba(0, 0, 0, 0.17); @mount-loading-color: #333; diff --git a/plugins/c9.ide.layout.classic/themes/default-light-gray.less b/plugins/c9.ide.layout.classic/themes/default-light-gray.less index ebf4895d..e3accdc7 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light-gray.less +++ b/plugins/c9.ide.layout.classic/themes/default-light-gray.less @@ -1591,7 +1591,7 @@ @upload-frame-item-color: #e1e1e1; // Mount -@mount-container-padding: 18px 10px 12px 10px; +@mount-container-padding: 8px 0px 2px 0px; @mount-loading-background: rgba(0,0,0,0.5); @mount-loading-color: #f1f1f1; diff --git a/plugins/c9.ide.layout.classic/themes/default-light.less b/plugins/c9.ide.layout.classic/themes/default-light.less index 982b7177..657a8a94 100644 --- a/plugins/c9.ide.layout.classic/themes/default-light.less +++ b/plugins/c9.ide.layout.classic/themes/default-light.less @@ -1591,7 +1591,7 @@ @upload-frame-item-color: #e1e1e1; // Mount -@mount-container-padding: 18px 10px 12px 10px; +@mount-container-padding: 8px 0px 2px 0px; @mount-loading-background: rgba(0,0,0,0.5); @mount-loading-color: #f1f1f1; diff --git a/plugins/c9.vfs.client/vfs.ping.js b/plugins/c9.vfs.client/vfs.ping.js index e458d929..8128bfeb 100644 --- a/plugins/c9.vfs.client/vfs.ping.js +++ b/plugins/c9.vfs.client/vfs.ping.js @@ -1,7 +1,7 @@ define(function(require, exports, module) { "use strict"; - main.consumes = ["Plugin", "ext", "c9"]; + main.consumes = ["Plugin", "ext", "c9", "vfs"]; main.provides = ["vfs.ping"]; return main; diff --git a/plugins/c9.vfs.server/vfs.js b/plugins/c9.vfs.server/vfs.js index 912016a9..1a6e18d5 100644 --- a/plugins/c9.vfs.server/vfs.js +++ b/plugins/c9.vfs.server/vfs.js @@ -181,7 +181,6 @@ Vfs.prototype._createEngine = function(vfs, options) { if (!eioSocket || listeningForEIOSocketClose) return; eioSocket.once("close", function (reason, description) { var logMetadata = {message: "Socket closed", collab: options.collab, reason: reason, description: description, id: that.id, sid: socket.id, pid: that.pid}; - console.log(logMetadata); that.logger.log(logMetadata); listeningForEIOSocketClose = false; }); @@ -196,7 +195,6 @@ Vfs.prototype._createEngine = function(vfs, options) { } socket.on('disconnect', function (err) { var logMetadata = {message: "Socket disconnected", collab: options.collab, err: err, id: that.id, sid: socket.id, pid: that.pid}; - console.log(logMetadata); that.logger.log(logMetadata); }); @@ -217,9 +215,7 @@ Vfs.prototype._createEngine = function(vfs, options) { } worker.on("disconnect", function() { - var logMetadata = {collab: options.collab, id: that.id, sid: socket.id, pid: that.pid}; - console.log("VFS socket disconnect:", logMetadata); - logMetadata.message = "VFS socket disconnect"; + var logMetadata = {message: "VFS socket disconnect", collab: options.collab, id: that.id, sid: socket.id, pid: that.pid}; that.logger.log(logMetadata); if (options.collab) { if (collabApi)