kopia lustrzana https://github.com/c9/core
Merge pull request +10493 from c9/fix/tab-pane-closing
Fix Tab/Pane closingpull/223/head
commit
18405558aa
|
@ -69,7 +69,7 @@
|
|||
"c9.ide.collab": "#850eadfcca",
|
||||
"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",
|
||||
|
@ -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": "#5ae88f87e1",
|
||||
"c9.ide.closeconfirmation": "#cee4674141",
|
||||
"c9.ide.configuration": "#a9066299a2",
|
||||
"c9.ide.dialog.wizard": "#7667ec79a8",
|
||||
|
|
|
@ -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: [
|
||||
|
|
|
@ -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 && e.last || amlPane.getPages().length === 0;
|
||||
if (last)
|
||||
apf.setStyleClass(amlPane.$ext, "empty");
|
||||
|
||||
|
|
|
@ -69,7 +69,6 @@
|
|||
}
|
||||
|
||||
.dropdown-dark-glossy-options {
|
||||
.box-sizing(border-box);
|
||||
display: none;
|
||||
background: @menu-background;
|
||||
border: 1px solid @menu-border-color;
|
||||
|
|
Ładowanie…
Reference in New Issue