Skip to content

Commit 4b3dc2f

Browse files
rueckstiesskangas
authored andcommitted
handle caret without affecting children carets
1 parent ff987fe commit 4b3dc2f

File tree

3 files changed

+17
-12
lines changed

3 files changed

+17
-12
lines changed

scout-ui/src/field-list/index.js

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,20 @@ var MinichartView = require('../minicharts');
44
var FieldCollection = require('mongodb-schema').FieldCollection;
55
var ViewSwitcher = require('ampersand-view-switcher');
66
var debug = require('debug')('scout-ui:field-list:index');
7+
var $ = require('jquery');
78
var _ = require('lodash');
89

10+
function handleCaret(el, value, previousValue) {
11+
var $el = $(el);
12+
// only apply to own caret, not children carets
13+
if ($el.next().text() !== this.model.name) return;
14+
if (this.model.fields || this.model.arrayFields) {
15+
$el.addClass('caret');
16+
} else {
17+
$el.removeClass('caret');
18+
}
19+
}
20+
921
var FieldView = View.extend({
1022
props: {
1123
minichartModel: 'state',
@@ -15,21 +27,17 @@ var FieldView = View.extend({
1527
}
1628
},
1729
bindings: {
30+
'model.name': {
31+
hook: 'name'
32+
},
1833
'model.fields': {
19-
type: 'booleanClass',
20-
yes: 'caret',
21-
no: '',
34+
type: handleCaret,
2235
hook: 'caret'
2336
},
2437
'model.arrayFields': {
25-
type: 'booleanClass',
26-
yes: 'caret',
27-
no: '',
38+
type: handleCaret,
2839
hook: 'caret'
2940
},
30-
'model.name': {
31-
hook: 'name'
32-
},
3341
'expanded': {
3442
type: 'booleanClass',
3543
yes: 'expanded',
@@ -73,7 +81,6 @@ var FieldView = View.extend({
7381
});
7482
}
7583
}
76-
7784
},
7885
initialize: function() {
7986
var that = this;

scout-ui/src/home/collection.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ var CollectionStatsView = require('../collection-stats');
55
var FieldListView = require('../field-list');
66
var DocumentListView = require('../document-view');
77
var RefineBarView = require('../refine-view');
8-
98
var debug = require('debug')('scout-ui:home:collection');
109
var $ = require('jquery');
1110

scout-ui/src/home/index.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@ var debug = require('debug')('scout-ui:home');
55
var app = require('ampersand-app');
66
var format = require('util').format;
77
var SidebarView = require('../sidebar');
8-
var FieldListView = require('../field-list');
98
var CollectionView = require('./collection');
109

1110
require('bootstrap/js/dropdown');

0 commit comments

Comments
 (0)