Skip to content

Commit 0b85e23

Browse files
committed
INT-412 kill sidebar-controls panel
The filter-fields control is broken, needs to move into the collection view anyway
1 parent 2cc8e17 commit 0b85e23

File tree

5 files changed

+1
-38
lines changed

5 files changed

+1
-38
lines changed

src/sidebar/index.jade

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,3 @@ div
33
div.scout-logo
44
div(data-hook='collection-filter-subview')
55
div(data-hook='collection-list-subview')
6-
div(data-hook='sidebar-control-subview')

src/sidebar/index.js

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ var _ = require('lodash');
33
var mousetrap = require('mousetrap');
44
var CollectionFilterView = require('./collection-filter');
55
var CollectionListView = require('./collection-list');
6-
var SidebarControlsView = require('./sidebar-controls');
76
var app = require('ampersand-app');
87

98
function fast_filter_collection(collection, pattern) {
@@ -60,22 +59,10 @@ var SidebarView = View.extend({
6059
});
6160
return view;
6261
}
63-
},
64-
sidebar_control: {
65-
hook: 'sidebar-control-subview',
66-
prepareView: function(el) {
67-
return new SidebarControlsView({
68-
el: el
69-
});
70-
}
7162
}
7263
},
7364
filterCollections: function(pattern) {
7465
_.defer(fast_filter_collection, this.collection, pattern);
75-
},
76-
filterFields: function(pattern) {
77-
var collection = app.schema.fields;
78-
_.defer(fast_filter_collection, collection, pattern);
7966
}
8067
});
8168

src/sidebar/sidebar-controls.jade

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/sidebar/sidebar-controls.js

Lines changed: 0 additions & 9 deletions
This file was deleted.

styles/sidebar.less

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
line-height: 24px;
4747
position: absolute;
4848
top: 128px;
49-
bottom: 60px;
49+
bottom: 0px;
5050
overflow-y: auto;
5151
width: 100%;
5252
z-index: -1;
@@ -111,16 +111,6 @@
111111
}
112112
}
113113
}
114-
.sidebar-controls {
115-
position: absolute;
116-
width: @sidebar-width;
117-
bottom: 0;
118-
height: 60px;
119-
120-
.list-filter {
121-
box-shadow: 0 -2px 0 rgba(0,0,0,0.2);
122-
}
123-
}
124114
}
125115

126116
.sidebar {

0 commit comments

Comments
 (0)