Skip to content
This repository has been archived by the owner on Sep 6, 2021. It is now read-only.

[replace-across-files] Unify the Search Results Panel FindInFiles/ReplaceAll #7727

Closed
wants to merge 3 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/htmlContent/search-panel.html
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<div id="search-results" class="bottom-panel vert-resizable top-resizer no-focus">
<div id="{{panelID}}" class="search-results bottom-panel vert-resizable top-resizer no-focus">
<div class="toolbar simple-toolbar-layout">
<div class="title"></div>
<a href="#" class="close">&times;</a>
Expand Down
17 changes: 0 additions & 17 deletions src/htmlContent/search-replace-panel.html

This file was deleted.

11 changes: 0 additions & 11 deletions src/htmlContent/search-replace-results.html

This file was deleted.

5 changes: 3 additions & 2 deletions src/htmlContent/search-results.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,14 @@
<tbody>
{{#searchList}}
<tr class="file-section" data-file="{{file}}">
<td colspan="2">
<td colspan="{{#hasCheckboxes}}3{{/hasCheckboxes}}{{^hasCheckboxes}}2{{/hasCheckboxes}}">
<span class="disclosure-triangle expanded" title="{{Strings.FIND_IN_FILES_EXPAND_COLLAPSE}}"></span>
{{{filename}}}
</td>
</tr>
{{#items}}
<tr data-file="{{file}}" data-item="{{item}}">
<tr data-file="{{file}}" data-item="{{item}}" data-index="{{index}}">
{{#hasCheckboxes}}<td class="checkbox-column"><input type="checkbox" class="check-one" {{#isChecked}}checked="true"{{/isChecked}} /></td>{{/hasCheckboxes}}
<td class="line-number">{{line}}</td>
<td class="line-text">{{pre}}<span class="highlight">{{highlight}}</span>{{post}}</td>
</tr>
Expand Down
6 changes: 6 additions & 0 deletions src/htmlContent/search-summary-find.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
<div class="fixed-col">{{Strings.FIND_IN_FILES_TITLE_PART1}}</div>
<div class="contracting-col">{{query}}</div>
<div class="fixed-col">{{Strings.FIND_IN_FILES_TITLE_PART2}}</div>
<div class="contracting-col">{{{scope}}}</div>
<div class="fixed-col">{{{summary}}}</div>
{{>paging}}
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
<div class="fixed-col">{{Strings.FIND_IN_FILES_TITLE_PART1}}</div>
<div class="contracting-col">{{query}}</div>
<div class="fixed-col">{{Strings.FIND_IN_FILES_TITLE_PART2}}</div>
<div class="contracting-col">{{{scope}}}</div>
<div class="fixed-col">{{{summary}}}</div>
{{#hasPages}}
<div class="pagination-col">
<span class="first-page {{^hasPrev}}disabled{{/hasPrev}}"></span>
Expand All @@ -11,4 +6,4 @@
<span class="next-page {{^hasNext}}disabled{{/hasNext}}"></span>
<span class="last-page {{^hasNext}}disabled{{/hasNext}}"></span>
</div>
{{/hasPages}}
{{/hasPages}}
10 changes: 10 additions & 0 deletions src/htmlContent/search-summary-replace.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<div class="fixed-col"><input type="checkbox" class="check-all" {{#allChecked}}checked="checked"{{/allChecked}} /></div>
<div class="fixed-col">{{Strings.FIND_REPLACE_TITLE_PART1}}</div>
<div class="contracting-col">{{replaceWhat}}</div>
<div class="fixed-col">{{Strings.FIND_REPLACE_TITLE_PART2}}</div>
<div class="contracting-col">{{replaceWith}}</div>
<div class="fixed-col">{{{summary}}}</div>
{{>paging}}
<div class="replace-col">
<button class="btn small replace-checked">{{Strings.BUTTON_REPLACE}}</button>
</div>
Loading