From d025c0a5bebf5f111a5f9596ce45121c4f7afb43 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 3 Jul 2015 14:23:07 +0400
Subject: [PATCH 1/3] fix +8094 Pane/tab & navigation errors

---
 package.json                   |  2 +-
 plugins/c9.ide.editors/pane.js | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index 1623430a..bce285e1 100644
--- a/package.json
+++ b/package.json
@@ -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",
diff --git a/plugins/c9.ide.editors/pane.js b/plugins/c9.ide.editors/pane.js
index 851de469..aeb17e1a 100644
--- a/plugins/c9.ide.editors/pane.js
+++ b/plugins/c9.ide.editors/pane.js
@@ -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"

From 8710e6e850da9d1355a98d39f49f1d58c7a3f900 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 3 Jul 2015 14:35:35 +0400
Subject: [PATCH 2/3] fix +7413 cmd+[ is passed to browser if there is only one
 tab in the pane

---
 plugins/c9.ide.keys/commands.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/plugins/c9.ide.keys/commands.js b/plugins/c9.ide.keys/commands.js
index 847e4c2a..2260f181 100644
--- a/plugins/c9.ide.keys/commands.js
+++ b/plugins/c9.ide.keys/commands.js
@@ -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
                 },

From 8ade1ef53cfa09d6a0b2a4091fe5b66cc50acb08 Mon Sep 17 00:00:00 2001
From: nightwing <amirjanyan@gmail.com>
Date: Fri, 3 Jul 2015 18:25:58 +0400
Subject: [PATCH 3/3] fix +7917: collapsed chat pane does not indicate new
 messages

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index bce285e1..f79e7916 100644
--- a/package.json
+++ b/package.json
@@ -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",