b2198e8233
- gr-file-list recognizes local preferences (for hasRangedComments flag) - gr-file-list reacts to cursor hotkey only if there is no range selected (currently always false). - Remove dead code from GrDiffBuilderSideBySide, GrDiffBuilder, gr-diff-builder.html - Bugfix: GrDiffBuilder.prototype.getGroupsByLineRange handles one-line BOTH code sections correctly. Test updated as well. - Added utitily methods added to gr-diff-builder.html to reduce dependency on DOM structure and reduce amount of code copy-pasting: - renderLineRange, getContentByLine, etc - For gr-diff.js and gr-diff-comment-thread.js addDraft renamed to addOrEditDraft because that's what it does. - For both, addDraft method always creates a draft comment. - Added support for ranged comments in gr-diff, gr-diff-comment-thread. - Added mouseenter and mouseout events to gr-comment.js - Refactored gr-comment.js to reduce code copy-paste, unify event payload, and to eliminate need of accessing component instance for patchNum. Tests updated as well. - Refactored gr-diff.js UI data model update using gr-diff-builder.html utility methods to make code more readable. - Added support for creating ranged comments to gr-diff.js. - gr-selection-action-box now reacts to click and tap to create a comment. Change-Id: I01480a4c6f460774a8b2826915702800b3f81d25
68 lines
2.5 KiB
JavaScript
68 lines
2.5 KiB
JavaScript
// Copyright (C) 2016 The Android Open Source Project
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the 'License');
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an 'AS IS' BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
(function(window, GrDiffBuilder) {
|
|
'use strict';
|
|
|
|
function GrDiffBuilderSideBySide(diff, comments, prefs, outputEl) {
|
|
GrDiffBuilder.call(this, diff, comments, prefs, outputEl);
|
|
}
|
|
GrDiffBuilderSideBySide.prototype = Object.create(GrDiffBuilder.prototype);
|
|
GrDiffBuilderSideBySide.prototype.constructor = GrDiffBuilderSideBySide;
|
|
|
|
GrDiffBuilderSideBySide.prototype.buildSectionElement = function(group) {
|
|
var sectionEl = this._createElement('tbody', 'section');
|
|
sectionEl.classList.add(group.type);
|
|
var pairs = group.getSideBySidePairs();
|
|
for (var i = 0; i < pairs.length; i++) {
|
|
sectionEl.appendChild(this._createRow(sectionEl, pairs[i].left,
|
|
pairs[i].right));
|
|
}
|
|
return sectionEl;
|
|
};
|
|
|
|
GrDiffBuilderSideBySide.prototype._createRow = function(section, leftLine,
|
|
rightLine) {
|
|
var row = this._createElement('tr');
|
|
row.classList.add('diff-row', 'side-by-side');
|
|
row.setAttribute('left-type', leftLine.type);
|
|
row.setAttribute('right-type', rightLine.type);
|
|
|
|
this._appendPair(section, row, leftLine, leftLine.beforeNumber,
|
|
GrDiffBuilder.Side.LEFT);
|
|
this._appendPair(section, row, rightLine, rightLine.afterNumber,
|
|
GrDiffBuilder.Side.RIGHT);
|
|
return row;
|
|
};
|
|
|
|
GrDiffBuilderSideBySide.prototype._appendPair = function(section, row, line,
|
|
lineNumber, side) {
|
|
var lineEl = this._createLineEl(line, lineNumber, line.type, side);
|
|
lineEl.classList.add(side);
|
|
row.appendChild(lineEl);
|
|
var action = this._createContextControl(section, line);
|
|
if (action) {
|
|
row.appendChild(action);
|
|
} else {
|
|
var textEl = this._createTextEl(line);
|
|
var threadEl = this._commentThreadForLine(line, side);
|
|
if (threadEl) {
|
|
textEl.appendChild(threadEl);
|
|
}
|
|
row.appendChild(textEl);
|
|
}
|
|
};
|
|
|
|
window.GrDiffBuilderSideBySide = GrDiffBuilderSideBySide;
|
|
})(window, GrDiffBuilder);
|