From fb0a4644e7e905e4a1321b485d2d777a951ffb02 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sat, 14 Nov 2015 00:03:17 +0000 Subject: [PATCH 1/7] Add a setting to not automatically close a pane when the last tab is closed --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 89f2122f..da77847e 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "c9.ide.ace.split": "#0ae0151c78", "c9.ide.ace.statusbar": "#2155083cf6", "c9.ide.ace.stripws": "#cf0f42ac59", - "c9.ide.behaviors": "#ee32d7da73", + "c9.ide.behaviors": "#6530a20004", "c9.ide.closeconfirmation": "#cee4674141", "c9.ide.configuration": "#a9066299a2", "c9.ide.dialog.wizard": "#7667ec79a8", From 3ed3bb9a0579653c11fd96a79893f4a5321b3f24 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sat, 14 Nov 2015 00:45:45 +0000 Subject: [PATCH 2/7] Hide tab/pane immediately when closing last tab of pane and setting to keep pane is off --- package.json | 2 +- plugins/c9.ide.editors/pane.js | 29 ++++++++++++++++++----------- plugins/c9.ide.editors/tab.js | 2 +- 3 files changed, 20 insertions(+), 13 deletions(-) diff --git a/package.json b/package.json index da77847e..b5d216fc 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "c9.ide.ace.split": "#0ae0151c78", "c9.ide.ace.statusbar": "#2155083cf6", "c9.ide.ace.stripws": "#cf0f42ac59", - "c9.ide.behaviors": "#6530a20004", + "c9.ide.behaviors": "#13d2c56564", "c9.ide.closeconfirmation": "#cee4674141", "c9.ide.configuration": "#a9066299a2", "c9.ide.dialog.wizard": "#7667ec79a8", diff --git a/plugins/c9.ide.editors/pane.js b/plugins/c9.ide.editors/pane.js index 9a040d9c..d796518f 100644 --- a/plugins/c9.ide.editors/pane.js +++ b/plugins/c9.ide.editors/pane.js @@ -103,23 +103,30 @@ define(function(require, module, exports) { emit("afterClose", event); if (tab.aml.$amlDestroyed) { - tab.unload(e); + tab.unload(event); closing--; } + else if (tab.meta.$skipAnimation) { + closeNow(); + } else { tab.aml.on("afterclose", function(){ - if (tab.meta.$closeSync) { - tab.unload(e); - closing--; - } - else { - setTimeout(function(){ - tab.unload(e); - closing--; - }); - } + closeNow(); }); } + + function closeNow(){ + if (tab.meta.$closeSync) { + tab.unload(event); + closing--; + } + else { + setTimeout(function(){ + tab.unload(event); + closing--; + }); + } + } }, overactivetab: true, childNodes: [ diff --git a/plugins/c9.ide.editors/tab.js b/plugins/c9.ide.editors/tab.js index 83f07223..ea647873 100644 --- a/plugins/c9.ide.editors/tab.js +++ b/plugins/c9.ide.editors/tab.js @@ -304,7 +304,7 @@ define(function(require, module, exports) { if (rule) ui.removeStyleRule(rule, stylesheet); // If there are no more pages left, reset location - var last = amlPane.getPages().length === 0; + var last = e.last || amlPane.getPages().length === 0; if (last) apf.setStyleClass(amlPane.$ext, "empty"); From 4672d219b4dd9a0908e86b247c375016b4d0cce7 Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sat, 14 Nov 2015 00:46:55 +0000 Subject: [PATCH 3/7] oops --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index b5d216fc..753a1bb7 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "c9.ide.ace.split": "#0ae0151c78", "c9.ide.ace.statusbar": "#2155083cf6", "c9.ide.ace.stripws": "#cf0f42ac59", - "c9.ide.behaviors": "#13d2c56564", + "c9.ide.behaviors": "#b1ded4c77c", "c9.ide.closeconfirmation": "#cee4674141", "c9.ide.configuration": "#a9066299a2", "c9.ide.dialog.wizard": "#7667ec79a8", From 57ec419e861fb4355bce3a560cc0e984bb5ec92c Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sat, 14 Nov 2015 01:26:30 +0000 Subject: [PATCH 4/7] don't expect e to be defined --- plugins/c9.ide.editors/tab.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plugins/c9.ide.editors/tab.js b/plugins/c9.ide.editors/tab.js index ea647873..37f4d4e6 100644 --- a/plugins/c9.ide.editors/tab.js +++ b/plugins/c9.ide.editors/tab.js @@ -304,7 +304,7 @@ define(function(require, module, exports) { if (rule) ui.removeStyleRule(rule, stylesheet); // If there are no more pages left, reset location - var last = e.last || amlPane.getPages().length === 0; + var last = e && e.last || amlPane.getPages().length === 0; if (last) apf.setStyleClass(amlPane.$ext, "empty"); From 31bfccd3082ea37d31dbcd867d8b36b9ce6b486a Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sat, 14 Nov 2015 01:45:12 +0000 Subject: [PATCH 5/7] Add setting for project path find in files. Fixes +3655 --- package.json | 2 +- plugins/c9.ide.layout.classic/less/dropdown-dark-glossy.less | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/package.json b/package.json index 753a1bb7..5ad1521f 100644 --- a/package.json +++ b/package.json @@ -69,7 +69,7 @@ "c9.ide.collab": "#f06cc0653e", "c9.ide.local": "#a6e689e33b", "c9.ide.find": "#35379124ca", - "c9.ide.find.infiles": "#c132ad243c", + "c9.ide.find.infiles": "#c3bf17286d", "c9.ide.find.replace": "#44772dd796", "c9.ide.run.debug": "#dbe6c81252", "c9.automate": "#47e2c429c9", diff --git a/plugins/c9.ide.layout.classic/less/dropdown-dark-glossy.less b/plugins/c9.ide.layout.classic/less/dropdown-dark-glossy.less index 037fd678..adcbe2f1 100644 --- a/plugins/c9.ide.layout.classic/less/dropdown-dark-glossy.less +++ b/plugins/c9.ide.layout.classic/less/dropdown-dark-glossy.less @@ -69,7 +69,6 @@ } .dropdown-dark-glossy-options { - .box-sizing(border-box); display: none; background: @menu-background; border: 1px solid @menu-border-color; From f2032ce4179998f492024e2ca0fba0d0eca826cb Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sat, 14 Nov 2015 17:06:38 +0000 Subject: [PATCH 6/7] don't error when curpage.parentNode is undefined --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 5ad1521f..c4364696 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "c9.ide.ace.split": "#0ae0151c78", "c9.ide.ace.statusbar": "#2155083cf6", "c9.ide.ace.stripws": "#cf0f42ac59", - "c9.ide.behaviors": "#b1ded4c77c", + "c9.ide.behaviors": "#23fe1d9f78", "c9.ide.closeconfirmation": "#cee4674141", "c9.ide.configuration": "#a9066299a2", "c9.ide.dialog.wizard": "#7667ec79a8", From 8aa67d6030c454aa51ed4f998c335635f3472aaa Mon Sep 17 00:00:00 2001 From: Ruben Daniels Date: Sat, 14 Nov 2015 17:20:01 +0000 Subject: [PATCH 7/7] Autoclose tab after dragging --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index c4364696..167c5017 100644 --- a/package.json +++ b/package.json @@ -80,7 +80,7 @@ "c9.ide.ace.split": "#0ae0151c78", "c9.ide.ace.statusbar": "#2155083cf6", "c9.ide.ace.stripws": "#cf0f42ac59", - "c9.ide.behaviors": "#23fe1d9f78", + "c9.ide.behaviors": "#5ae88f87e1", "c9.ide.closeconfirmation": "#cee4674141", "c9.ide.configuration": "#a9066299a2", "c9.ide.dialog.wizard": "#7667ec79a8",