root/regexper-static
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleaning up code for match node

Browse Source
This commit is contained in:
Jeff Avallone 2014-12-10 19:58:36 -05:00
parent dbcdd583ed
commit 2e60561be6
1 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/js/parser/javascript/match.js
View File

@ -5,27 +5,24 @@ export default _.extend({}, Base, {
type: 'match', type: 'match',
_render() { _render() {
var parts = this.parts(); this.contents = { parts: this.parts() };
if (this.anchorStart() || this.anchorEnd() || parts.length !== 1) {
this.contents = {};
if (this.anchorStart()) { if (this.anchorStart()) {
this.contents.anchor_start = this.renderLabel('Start of line') this.contents.anchor_start = this.renderLabel('Start of line')
.addClass('anchor'); .addClass('anchor');
} }
this.contents.parts = _.map(parts, (function(part) {
part.render(this.container.group());
return part;
}).bind(this));
if (this.anchorEnd()) { if (this.anchorEnd()) {
this.contents.anchor_end = this.renderLabel('End of line') this.contents.anchor_end = this.renderLabel('End of line')
.addClass('anchor'); .addClass('anchor');
} }
if (this.contents.anchor_start || this.contents.anchor_end || this.contents.parts.length !== 1) {
_.each(this.contents.parts, (function(part) {
part.render(this.container.group());
}).bind(this));
} else { } else {
this.proxy(parts[0]); this.proxy(this.contents.parts[0]);
} }
}, },
@ -34,7 +31,7 @@ export default _.extend({}, Base, {
_.invoke(this.contents.parts, 'position'); _.invoke(this.contents.parts, 'position');
items = _(this.contents).values().flatten().value(); items = _(this.contents).at('anchor_start', 'parts', 'anchor_end').flatten().compact().value();
this.spaceHorizontally(items, { this.spaceHorizontally(items, {
padding: 10 padding: 10
}); });