Expand context when the control is clicked in gr-new-diff
Change-Id: I7473914dbc66596c7c6c01aa5545ac66a7136451
This commit is contained in:
@@ -20,25 +20,27 @@
|
|||||||
GrDiffBuilderSideBySide.prototype = Object.create(GrDiffBuilder.prototype);
|
GrDiffBuilderSideBySide.prototype = Object.create(GrDiffBuilder.prototype);
|
||||||
GrDiffBuilderSideBySide.prototype.constructor = GrDiffBuilderSideBySide;
|
GrDiffBuilderSideBySide.prototype.constructor = GrDiffBuilderSideBySide;
|
||||||
|
|
||||||
GrDiffBuilderSideBySide.prototype._emitGroup = function(group,
|
GrDiffBuilderSideBySide.prototype.emitGroup = function(group,
|
||||||
opt_beforeSection) {
|
opt_beforeSection) {
|
||||||
var sectionEl = this._createElement('tbody', 'section');
|
var sectionEl = this._createElement('tbody', 'section');
|
||||||
sectionEl.classList.add(group.type);
|
sectionEl.classList.add(group.type);
|
||||||
var pairs = group.getSideBySidePairs();
|
var pairs = group.getSideBySidePairs();
|
||||||
for (var i = 0; i < pairs.length; i++) {
|
for (var i = 0; i < pairs.length; i++) {
|
||||||
sectionEl.appendChild(this._createRow(pairs[i].left, pairs[i].right));
|
sectionEl.appendChild(this._createRow(sectionEl, pairs[i].left,
|
||||||
|
pairs[i].right));
|
||||||
}
|
}
|
||||||
this._outputEl.insertBefore(sectionEl, opt_beforeSection);
|
this._outputEl.insertBefore(sectionEl, opt_beforeSection);
|
||||||
},
|
},
|
||||||
|
|
||||||
GrDiffBuilderSideBySide.prototype._createRow = function(leftLine, rightLine) {
|
GrDiffBuilderSideBySide.prototype._createRow = function(section, leftLine,
|
||||||
|
rightLine) {
|
||||||
var row = this._createElement('tr');
|
var row = this._createElement('tr');
|
||||||
this._createPair(row, leftLine, leftLine.beforeNumber);
|
this._createPair(section, row, leftLine, leftLine.beforeNumber);
|
||||||
this._createPair(row, rightLine, rightLine.afterNumber);
|
this._createPair(section, row, rightLine, rightLine.afterNumber);
|
||||||
return row;
|
return row;
|
||||||
};
|
};
|
||||||
|
|
||||||
GrDiffBuilderSideBySide.prototype._createPair = function(row, line,
|
GrDiffBuilderSideBySide.prototype._createPair = function(section, row, line,
|
||||||
lineNumber) {
|
lineNumber) {
|
||||||
if (line.type === GrDiffLine.Type.BLANK) {
|
if (line.type === GrDiffLine.Type.BLANK) {
|
||||||
row.appendChild(this._createBlankSideEl());
|
row.appendChild(this._createBlankSideEl());
|
||||||
@@ -46,7 +48,7 @@
|
|||||||
}
|
}
|
||||||
|
|
||||||
row.appendChild(this._createLineEl(line, lineNumber, line.type));
|
row.appendChild(this._createLineEl(line, lineNumber, line.type));
|
||||||
var action = this._createContextControl(row, line);
|
var action = this._createContextControl(section, line);
|
||||||
if (action) {
|
if (action) {
|
||||||
row.appendChild(action);
|
row.appendChild(action);
|
||||||
} else {
|
} else {
|
||||||
|
@@ -20,24 +20,24 @@
|
|||||||
GrDiffBuilderUnified.prototype = Object.create(GrDiffBuilder.prototype);
|
GrDiffBuilderUnified.prototype = Object.create(GrDiffBuilder.prototype);
|
||||||
GrDiffBuilderUnified.prototype.constructor = GrDiffBuilderUnified;
|
GrDiffBuilderUnified.prototype.constructor = GrDiffBuilderUnified;
|
||||||
|
|
||||||
GrDiffBuilderUnified.prototype._emitGroup = function(group,
|
GrDiffBuilderUnified.prototype.emitGroup = function(group,
|
||||||
opt_beforeSection) {
|
opt_beforeSection) {
|
||||||
var sectionEl = this._createElement('tbody', 'section');
|
var sectionEl = this._createElement('tbody', 'section');
|
||||||
|
|
||||||
for (var i = 0; i < group.lines.length; ++i) {
|
for (var i = 0; i < group.lines.length; ++i) {
|
||||||
sectionEl.appendChild(this._createRow(group.lines[i]));
|
sectionEl.appendChild(this._createRow(sectionEl, group.lines[i]));
|
||||||
}
|
}
|
||||||
this._outputEl.insertBefore(sectionEl, opt_beforeSection);
|
this._outputEl.insertBefore(sectionEl, opt_beforeSection);
|
||||||
};
|
};
|
||||||
|
|
||||||
GrDiffBuilderUnified.prototype._createRow = function(line) {
|
GrDiffBuilderUnified.prototype._createRow = function(section, line) {
|
||||||
var row = this._createElement('tr', line.type);
|
var row = this._createElement('tr', line.type);
|
||||||
row.appendChild(this._createLineEl(line, line.beforeNumber,
|
row.appendChild(this._createLineEl(line, line.beforeNumber,
|
||||||
GrDiffLine.Type.REMOVE));
|
GrDiffLine.Type.REMOVE));
|
||||||
row.appendChild(this._createLineEl(line, line.afterNumber,
|
row.appendChild(this._createLineEl(line, line.afterNumber,
|
||||||
GrDiffLine.Type.ADD));
|
GrDiffLine.Type.ADD));
|
||||||
|
|
||||||
var action = this._createContextControl(row, line);
|
var action = this._createContextControl(section, line);
|
||||||
if (action) {
|
if (action) {
|
||||||
row.appendChild(action);
|
row.appendChild(action);
|
||||||
} else {
|
} else {
|
||||||
|
@@ -30,11 +30,11 @@
|
|||||||
|
|
||||||
GrDiffBuilder.prototype.emitDiff = function() {
|
GrDiffBuilder.prototype.emitDiff = function() {
|
||||||
for (var i = 0; i < this._groups.length; i++) {
|
for (var i = 0; i < this._groups.length; i++) {
|
||||||
this._emitGroup(this._groups[i]);
|
this.emitGroup(this._groups[i]);
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
GrDiffBuilder.prototype._emitGroup = function(group, opt_beforeSection) {
|
GrDiffBuilder.prototype.emitGroup = function(group, opt_beforeSection) {
|
||||||
throw Error('Subclasses must implement emitGroup');
|
throw Error('Subclasses must implement emitGroup');
|
||||||
},
|
},
|
||||||
|
|
||||||
@@ -147,7 +147,10 @@
|
|||||||
text += '...';
|
text += '...';
|
||||||
button.textContent = text;
|
button.textContent = text;
|
||||||
button.addEventListener('tap', function(e) {
|
button.addEventListener('tap', function(e) {
|
||||||
e.detail = {section: section, line: line};
|
e.detail = {
|
||||||
|
group: new GrDiffGroup(GrDiffGroup.Type.BOTH, line.contextLines),
|
||||||
|
section: section,
|
||||||
|
};
|
||||||
// Let it bubble up the DOM tree.
|
// Let it bubble up the DOM tree.
|
||||||
});
|
});
|
||||||
td.appendChild(button);
|
td.appendChild(button);
|
||||||
|
@@ -39,9 +39,10 @@
|
|||||||
},
|
},
|
||||||
_viewMode: {
|
_viewMode: {
|
||||||
type: String,
|
type: String,
|
||||||
value: DiffViewMode.UNIFIED,
|
value: DiffViewMode.SIDE_BY_SIDE,
|
||||||
},
|
},
|
||||||
_diff: Object,
|
_diff: Object,
|
||||||
|
_diffBuilder: Object,
|
||||||
},
|
},
|
||||||
|
|
||||||
observers: [
|
observers: [
|
||||||
@@ -59,7 +60,15 @@
|
|||||||
},
|
},
|
||||||
|
|
||||||
_handleTap: function(e) {
|
_handleTap: function(e) {
|
||||||
console.table(e)
|
var el = Polymer.dom(e).rootTarget;
|
||||||
|
if (el.classList.contains('showContext')) {
|
||||||
|
this._showContext(e.detail.group, e.detail.section);
|
||||||
|
}
|
||||||
|
},
|
||||||
|
|
||||||
|
_showContext: function(group, sectionEl) {
|
||||||
|
this._builder.emitGroup(group, sectionEl);
|
||||||
|
sectionEl.parentNode.removeChild(sectionEl);
|
||||||
},
|
},
|
||||||
|
|
||||||
_render: function(diff, prefsChangeRecord) {
|
_render: function(diff, prefsChangeRecord) {
|
||||||
@@ -67,8 +76,8 @@
|
|||||||
this.customStyle['--content-width'] = prefs.line_length + 'ch';
|
this.customStyle['--content-width'] = prefs.line_length + 'ch';
|
||||||
this.updateStyles();
|
this.updateStyles();
|
||||||
|
|
||||||
var builder = this._getDiffBuilder(diff, prefs);
|
this._builder = this._getDiffBuilder(diff, prefs);
|
||||||
builder.emitDiff(diff.content);
|
this._builder.emitDiff(diff.content);
|
||||||
},
|
},
|
||||||
|
|
||||||
_getDiff: function() {
|
_getDiff: function() {
|
||||||
|
Reference in New Issue
Block a user