0727efa3d1
Previously, the rest api interface set '__isOnParent' for comments. When comments were added, the property from the comment thread 'isOnParent' was passed as a property. When the draft was saved, it was expecting '__isOnParent' rather than 'isOnParent' and this caused comments to show up on the wrong side after saved/refreshed, because '__isOnParent' was undefined. Instead of changing to either '__isOnParent' which would be strange to pass as an attribute or 'isOnParent' which would look like it came from the api directly, this change introduces isOnParent functions so that translation doesn't need to be done with the API. Bug: Issue 5831 Change-Id: I3b849ba5878275cda0a39638626a12bd51341a29
68 lines
2.0 KiB
JavaScript
68 lines
2.0 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() {
|
|
'use strict';
|
|
|
|
Polymer({
|
|
is: 'gr-comment-list',
|
|
behaviors: [Gerrit.PathListBehavior],
|
|
|
|
properties: {
|
|
changeNum: Number,
|
|
comments: Object,
|
|
patchNum: Number,
|
|
projectConfig: Object,
|
|
},
|
|
|
|
_computeFilesFromComments: function(comments) {
|
|
var arr = Object.keys(comments || {});
|
|
return arr.sort(this.specialFilePathCompare);
|
|
},
|
|
|
|
_computeFileDiffURL: function(file, changeNum, patchNum) {
|
|
return '/c/' + changeNum + '/' + patchNum + '/' + file;
|
|
},
|
|
|
|
_isOnParent: function(comment) {
|
|
return comment.side === 'PARENT';
|
|
},
|
|
|
|
_computeDiffLineURL: function(file, changeNum, patchNum, comment) {
|
|
var diffURL = this._computeFileDiffURL(file, changeNum, patchNum);
|
|
if (comment.line) {
|
|
diffURL += '#';
|
|
if (this._isOnParent(comment)) { diffURL += 'b'; }
|
|
diffURL += comment.line;
|
|
}
|
|
return diffURL;
|
|
},
|
|
|
|
_computeCommentsForFile: function(comments, file) {
|
|
// Changes are not picked up by the dom-repeat due to the array instance
|
|
// identity not changing even when it has elements added/removed from it.
|
|
return (comments[file] || []).slice();
|
|
},
|
|
|
|
_computePatchDisplayName: function(comment) {
|
|
if (this._isOnParent(comment)) {
|
|
return 'Base, ';
|
|
}
|
|
if (comment.patch_set != this.patchNum) {
|
|
return 'PS' + comment.patch_set + ', ';
|
|
}
|
|
return '';
|
|
},
|
|
});
|
|
})();
|