opendev/gerrit
Code Issues Proposed changes

Merge "Fix copy/paste edge case"

Browse Source
This commit is contained in:
Wyatt Allen
2017-01-24 22:20:10 +00:00
committed by Gerrit Code Review
parent 8f5b9aa08a 13ab50938a
commit f6f00a2ccb
2 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
polygerrit-ui/app/elements/diff/gr-diff-selection/gr-diff-selection.js
View File

@@ -113,7 +113,7 @@
var commentSelected = false; var commentSelected = false;
var target = this._getCopyEventTarget(e); var target = this._getCopyEventTarget(e);
if (target.type === 'textarea') { return; } if (target.type === 'textarea') { return; }
if (!this._elementDescendedFromClass(target, 'content')) { return; } if (!this._elementDescendedFromClass(target, 'diff-row')) { return; }
if (this.classList.contains(SelectionClass.COMMENT)) { if (this.classList.contains(SelectionClass.COMMENT)) {
commentSelected = true; commentSelected = true;
} }

18
polygerrit-ui/app/elements/diff/gr-diff-selection/gr-diff-selection_test.html
View File

@@ -28,7 +28,7 @@ limitations under the License.
<template> <template>
<gr-diff-selection> <gr-diff-selection>
<table id="diffTable" class="side-by-side"> <table id="diffTable" class="side-by-side">
<tr> <tr class="diff-row">
<td class="lineNum left" data-value="1">1</td> <td class="lineNum left" data-value="1">1</td>
<td class="content"> <td class="content">
<div class="contentText" data-side="left">ba ba</div> <div class="contentText" data-side="left">ba ba</div>
@@ -45,7 +45,7 @@ limitations under the License.
<div class="contentText" data-side="right">some other text</div> <div class="contentText" data-side="right">some other text</div>
</td> </td>
</tr> </tr>
<tr> <tr class="diff-row">
<td class="lineNum left" data-value="2">2</td> <td class="lineNum left" data-value="2">2</td>
<td class="content"> <td class="content">
<div class="contentText" data-side="left">zin</div> <div class="contentText" data-side="left">zin</div>
@@ -62,7 +62,7 @@ limitations under the License.
</div> </div>
</td> </td>
</tr> </tr>
<tr> <tr class="diff-row">
<td class="lineNum left" data-value="3">3</td> <td class="lineNum left" data-value="3">3</td>
<td class="content"> <td class="content">
<div class="contentText" data-side="left">ga ga</div> <div class="contentText" data-side="left">ga ga</div>
@@ -75,11 +75,8 @@ limitations under the License.
</div> </div>
</td> </td>
<td class="lineNum right" data-value="3">3</td> <td class="lineNum right" data-value="3">3</td>
<td class="other">
<div class="contentText" data-side="right">some other text</div>
</td>
</tr> </tr>
<tr> <tr class="diff-row">
<td class="lineNum left" data-value="4">4</td> <td class="lineNum left" data-value="4">4</td>
<td class="content"> <td class="content">
<div class="contentText" data-side="left">ga ga</div> <div class="contentText" data-side="left">ga ga</div>
@@ -91,6 +88,11 @@ limitations under the License.
</td> </td>
<td class="lineNum right" data-value="4">4</td> <td class="lineNum right" data-value="4">4</td>
</tr> </tr>
<tr class="not-diff-row">
<td class="other">
<div class="contentText" data-side="right">some other text</div>
</td>
</tr>
</table> </table>
</gr-diff-selection> </gr-diff-selection>
</template> </template>
@@ -168,7 +170,7 @@ limitations under the License.
test('ignores copy for non-content Element', function() { test('ignores copy for non-content Element', function() {
sandbox.stub(element, '_getSelectedText'); sandbox.stub(element, '_getSelectedText');
emulateCopyOn(element.querySelector('.other')); emulateCopyOn(element.querySelector('.not-diff-row'));
assert.isFalse(element._getSelectedText.called); assert.isFalse(element._getSelectedText.called);
}); });