From af7a410f2112f0494c8ad219fb87aca2f013129e Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 16 Feb 2015 16:55:41 +0000 Subject: [PATCH 1/2] Improved dialog API --- package.json | 2 +- plugins/c9.ide.dialog/dialog.js | 2 +- plugins/c9.ide.layout.classic/themes/default-dark-gray.less | 2 +- plugins/c9.ide.layout.classic/themes/default-dark.less | 2 +- plugins/c9.ide.layout.classic/themes/default-flat-light.less | 2 +- plugins/c9.ide.layout.classic/themes/default-light-gray.less | 2 +- plugins/c9.ide.layout.classic/themes/default-light.less | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 7ba443d5..3ac363ab 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "c9.ide.imgeditor": "#08bbc53578", "c9.ide.immediate": "#e9ba147cc2", "c9.ide.installer": "#24e7d6f399", - "c9.ide.mount": "#c9d598b254", + "c9.ide.mount": "#eac3f96d4f", "c9.ide.navigate": "#1ff8b463aa", "c9.ide.newresource": "#9a7464cc47", "c9.ide.openfiles": "#28a4f5af16", diff --git a/plugins/c9.ide.dialog/dialog.js b/plugins/c9.ide.dialog/dialog.js index ffb5579f..c0beb302 100644 --- a/plugins/c9.ide.dialog/dialog.js +++ b/plugins/c9.ide.dialog/dialog.js @@ -175,7 +175,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; From 6a4bcaa1f43bfe3112027235a92202c8515df432 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Mon, 16 Feb 2015 20:22:06 +0000 Subject: [PATCH 2/2] More API improvements --- package.json | 2 +- plugins/c9.core/ext.js | 5 ++++- plugins/c9.ide.dialog/dialog.js | 16 ++++++++++++---- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 3ac363ab..3e5392ba 100644 --- a/package.json +++ b/package.json @@ -83,7 +83,7 @@ "c9.ide.imgeditor": "#08bbc53578", "c9.ide.immediate": "#e9ba147cc2", "c9.ide.installer": "#24e7d6f399", - "c9.ide.mount": "#eac3f96d4f", + "c9.ide.mount": "#32e79866ee", "c9.ide.navigate": "#1ff8b463aa", "c9.ide.newresource": "#9a7464cc47", "c9.ide.openfiles": "#28a4f5af16", 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 c0beb302..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,