kopia lustrzana https://github.com/c9/core
Added filtering to branches panel
rodzic
9d87d18f55
commit
d5b1a42bed
|
@ -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",
|
||||
|
|
|
@ -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;
|
||||
|
||||
/*******/
|
||||
|
||||
|
|
|
@ -1711,4 +1711,4 @@
|
|||
@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;
|
|
@ -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);
|
||||
},
|
||||
/**
|
||||
*
|
||||
|
|
Ładowanie…
Reference in New Issue