kopia lustrzana https://github.com/c9/core
Merge branch 'master' of github.com:c9/newclient into profile-005-5-page-cache-project-page
commit
3ef86aaf34
|
@ -67,7 +67,7 @@
|
|||
"c9.ide.language.javascript.tern": "#2b0bb024da",
|
||||
"c9.ide.language.javascript.infer": "#cfec494a3c",
|
||||
"c9.ide.language.jsonalyzer": "#ba3e0d298c",
|
||||
"c9.ide.collab": "#f897cdb734",
|
||||
"c9.ide.collab": "#737f686017",
|
||||
"c9.ide.local": "#a9703b630c",
|
||||
"c9.ide.find": "#6cc6d3379d",
|
||||
"c9.ide.find.infiles": "#72582de3cd",
|
||||
|
@ -81,7 +81,7 @@
|
|||
"c9.ide.ace.split": "#0ae0151c78",
|
||||
"c9.ide.ace.statusbar": "#d95be89d53",
|
||||
"c9.ide.ace.stripws": "#cf0f42ac59",
|
||||
"c9.ide.behaviors": "#6aad7006a0",
|
||||
"c9.ide.behaviors": "#c3a9402cde",
|
||||
"c9.ide.closeconfirmation": "#a28bfd8272",
|
||||
"c9.ide.configuration": "#adf50fdaa2",
|
||||
"c9.ide.dialog.wizard": "#7667ec79a8",
|
||||
|
|
|
@ -230,7 +230,7 @@ define(function(require, module, exports) {
|
|||
}
|
||||
|
||||
function hsplit(far, vertically, split, ignore) {
|
||||
if (!split || !split.parentNode) split = amlPane;
|
||||
if (!$isValidSplit(split) || !split.parentNode) split = amlPane;
|
||||
|
||||
queue = []; // Used for resizing later
|
||||
|
||||
|
@ -270,6 +270,16 @@ define(function(require, module, exports) {
|
|||
return newtab.cloud9pane;
|
||||
}
|
||||
|
||||
function $isValidSplit(container) {
|
||||
// would be better to use tabmanager.containers instead
|
||||
while (container) {
|
||||
if (container.localName == "bar")
|
||||
break;
|
||||
container = container.parentNode;
|
||||
}
|
||||
return !!container;
|
||||
}
|
||||
|
||||
// Resize all editors in the queue
|
||||
function resizeAll(){
|
||||
queue.forEach(function(node) {
|
||||
|
@ -399,6 +409,8 @@ define(function(require, module, exports) {
|
|||
}
|
||||
|
||||
if (next) {
|
||||
if (!$isValidSplit(next))
|
||||
return;
|
||||
// Moving from horizontal to vertical or vice verse
|
||||
if (force || next.parentNode.localName != amlPane.parentNode.localName) {
|
||||
var tosplit = force || next.parentNode.localName == "bar"
|
||||
|
|
|
@ -69,7 +69,7 @@ define(function(require, exports, module) {
|
|||
name: "cancelBrowserAction",
|
||||
group: "ignore",
|
||||
bindKey: {
|
||||
mac: "Command-S|Cmd-R",
|
||||
mac: "Cmd-S|Cmd-R|Cmd-[|Cmd-]",
|
||||
win: "Ctrl-S|Ctrl-R|Alt-Left|Alt-Right",
|
||||
position: -10000
|
||||
},
|
||||
|
|
Ładowanie…
Reference in New Issue