
Follow-up to https://gerrit-review.googlesource.com/c/gerrit/+/157590 which no longer used locationRange to group comments together into threads. However, locationRange was still used for a few other things including thread removal, which could result in a bug if there were two threads that had the same locationRange and the wrong one was found first. Things included in this change: 1. Determine whether a thread group exists - This is identified as it was before. The thread group now gets a commentSide attribute, as it can pass it to all of its children (the same for all). 2. Determine if a thread exists within the group for a given range in a group - The range object is now included as an attribute on the comment thread instead of the locationRange string. 3. Be able to remove a thread group - A rootId attribute is now stored on the comment thread, which is data bound to each comment. When a comment is removed, it finds the thread with the rootId within the thread group to remove. - In the event that a thread group only contains a single draft, there is no roottId. Change-Id: I4f7804ac02f4259b4964c6333d258f0fc3b29d24
48 lines
1.6 KiB
HTML
48 lines
1.6 KiB
HTML
<!--
|
|
Copyright (C) 2017 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.
|
|
-->
|
|
|
|
<link rel="import" href="../../../bower_components/polymer/polymer.html">
|
|
<link rel="import" href="../gr-diff-comment-thread/gr-diff-comment-thread.html">
|
|
<link rel="import" href="../../../styles/shared-styles.html">
|
|
|
|
<dom-module id="gr-diff-comment-thread-group">
|
|
<template>
|
|
<style include="shared-styles">
|
|
:host {
|
|
display: block;
|
|
white-space: normal;
|
|
}
|
|
gr-diff-comment-thread + gr-diff-comment-thread {
|
|
margin-top: .2em;
|
|
}
|
|
</style>
|
|
<template is="dom-repeat" items="[[_threads]]" as="thread">
|
|
<gr-diff-comment-thread
|
|
comments="[[thread.comments]]"
|
|
comment-side="[[commentSide]]"
|
|
is-on-parent="[[isOnParent]]"
|
|
parent-index="[[parentIndex]]"
|
|
change-num="[[changeNum]]"
|
|
patch-num="[[thread.patchNum]]"
|
|
root-id="[[thread.rootId]]"
|
|
path="[[path]]"
|
|
project-name="[[projectName]]"
|
|
range="[[thread.range]]"></gr-diff-comment-thread>
|
|
</template>
|
|
</template>
|
|
<script src="gr-diff-comment-thread-group.js"></script>
|
|
</dom-module>
|