From d5b1a42bedc2bf02b620ad064bbd0bc2462ee912 Mon Sep 17 00:00:00 2001
From: Ruben Daniels <ruben@ajax.org>
Date: Mon, 16 Nov 2015 05:11:51 +0000
Subject: [PATCH] Added filtering to branches panel

---
 package.json                                  |  4 ++--
 .../themes/default-flat-dark.less             |  2 +-
 .../themes/default-flat-light.less            |  2 +-
 plugins/c9.ide.ui/widgets.list.js             | 21 ++++++++++++-------
 4 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/package.json b/package.json
index a2c0e5b7..fcb0ffd6 100644
--- a/package.json
+++ b/package.json
@@ -91,7 +91,7 @@
         "c9.ide.immediate": "#a962119bec",
         "c9.ide.installer": "#0fde9f0067",
         "c9.ide.mount": "#c4b3a1e4b7",
-        "c9.ide.navigate": "#c191d9b92f",
+        "c9.ide.navigate": "#ce95f27feb",
         "c9.ide.newresource": "#981a408a7b",
         "c9.ide.openfiles": "#7fa4a97fed",
         "c9.ide.preview": "#72a4521169",
@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#891f40a245",
         "c9.ide.save": "#76cf52ab6d",
-        "c9.ide.scm": "#200a1af2c9",
+        "c9.ide.scm": "#dc4253a48e",
         "c9.ide.terminal.monitor": "#35afa7f97f",
         "c9.ide.test": "#f3e5dad5cc",
         "c9.ide.test.mocha": "#586fb0cdc2",
diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
index 72acde7b..d5a3b5cf 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
@@ -1711,7 +1711,7 @@
 @form-bar-border-bottom: 1px solid black;
 @form-bar-box-shadow: 0 1px @border-highlight;
 
-@panel-settings-changes-top: 46px;
+@panel-settings-changes-top: 53px;
 
 /*******/
 
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 bc630707..fdfb3230 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
@@ -1711,4 +1711,4 @@
 @form-bar-border-bottom: 1px solid black;
 @form-bar-box-shadow: 0 1px @border-highlight;
 
-@panel-settings-changes-top: 46px;
\ No newline at end of file
+@panel-settings-changes-top: 53px;
\ No newline at end of file
diff --git a/plugins/c9.ide.ui/widgets.list.js b/plugins/c9.ide.ui/widgets.list.js
index 78d26dd8..baddaa89 100644
--- a/plugins/c9.ide.ui/widgets.list.js
+++ b/plugins/c9.ide.ui/widgets.list.js
@@ -34,7 +34,7 @@ define(function(require, exports, module) {
             var acetree;
             var model;
             var redirectEvents;
-            var filterRoot;
+            var fRoot;
             var meta = {};
             var dataType = options.model ? "object" : options.dataType;
             var excludedEvents = { 
@@ -296,18 +296,20 @@ define(function(require, exports, module) {
                 set filterKeyword(value){
                     model.keyword = value;
                     if (!model.keyword) {
-                        filterRoot = null;
+                        fRoot = null;
                         model.reKeyword = null;
                         model.setRoot(model.cachedRoot);
                     }
                     else {
                         model.reKeyword = new RegExp("(" 
                             + util.escapeRegExp(model.keyword) + ")", 'i');
-                        filterRoot = search.treeSearch(
-                            model.cachedRoot.items || model.cachedRoot, 
+                        fRoot = search.treeSearch(
+                            model.filterRoot 
+                                ? model.filterRoot.items || model.filterRoot
+                                : model.cachedRoot.items || model.cachedRoot, 
                             model.keyword, model.filterCaseInsensitive,
-                            null, null, model.indexProperty);
-                        model.setRoot(filterRoot);
+                            null, null, model.filterProperty);
+                        model.setRoot(fRoot);
                     }
                 },
                 /**
@@ -320,6 +322,11 @@ define(function(require, exports, module) {
                  */
                 get filterProperty(){ return model.filterProperty; },
                 set filterProperty(value){ model.filterProperty = value; },
+                /**
+                 * 
+                 */
+                get filterRoot(){ return model.filterRoot; },
+                set filterRoot(value){ model.filterRoot = value; },
                 /**
                  * 
                  */
@@ -590,7 +597,7 @@ define(function(require, exports, module) {
                  * 
                  */
                 refresh: function(){
-                    model.setRoot(filterRoot || plugin.root);
+                    model.setRoot(fRoot || plugin.root);
                 },
                 /**
                  *