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

Find in Files Improvements (Part 2: Pagination) #4303

Merged
merged 11 commits into from
Aug 8, 2013
Merged

Find in Files Improvements (Part 2: Pagination) #4303

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
843c5e2
Find in Files Pagination
TomMalbran Jun 20, 2013
926589b
Fix tab issue
TomMalbran Jun 20, 2013
bef0b28
Merge with Master
TomMalbran Jul 15, 2013
c92611c
Design changes after review
TomMalbran Jul 17, 2013
68d95f3
Code fixes after review
TomMalbran Jul 19, 2013
e02bda4
Additional fixes
TomMalbran Jul 19, 2013
700b5a0
Merge remote-tracking branch 'upstream/master' into tom/find-in-files-p2
TomMalbran Aug 6, 2013
070f488
Fixed the arrows position.
TomMalbran Aug 6, 2013
12e40ae
Updated the find in files title
TomMalbran Aug 6, 2013
b37ccb2
Go to first/last page
TomMalbran Aug 6, 2013
326463b
Added margin to the arrows
TomMalbran Aug 7, 2013
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
1 change: 0 additions & 1 deletion src/htmlContent/search-panel.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
<div id="search-results" class="bottom-panel vert-resizable top-resizer no-focus">
<div class="toolbar simple-toolbar-layout">
<div class="title">{{SEARCH_RESULTS}}</div>
<div class="title" id="search-result-summary"></div>
<a href="#" class="close">&times;</a>
</div>
Expand Down
6 changes: 6 additions & 0 deletions src/htmlContent/search-summary.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{{{summary}}}
{{#hasPages}}
<span class="left-triangle {{^hasLess}}disabled{{/hasLess}}"></span>
{{{results}}}
<span class="right-triangle {{^hasMore}}disabled{{/hasMore}}"></span>
{{/hasPages}}
9 changes: 5 additions & 4 deletions src/nls/root/strings.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,15 +123,17 @@ define({
"NO_UPDATE_TITLE" : "You're up to date!",
"NO_UPDATE_MESSAGE" : "You are running the latest version of {APP_NAME}.",

"FIND_IN_FILES_TITLE" : "for \"{4}\" {5} - {0} {1} in {2} {3}",
"FIND_IN_FILES_TITLE" : "\"{4}\" found {5} &mdash; {0} {1} in {2} {3}:",
"FIND_IN_FILES_SCOPED" : "in <span class='dialog-filename'>{0}</span>",
"FIND_IN_FILES_NO_SCOPE" : "in project",
"FIND_IN_FILES_FILE" : "file",
"FIND_IN_FILES_FILES" : "files",
"FIND_IN_FILES_MATCH" : "match",
"FIND_IN_FILES_MATCHES" : "matches",
"FIND_IN_FILES_MORE_THAN" : "More than ",
"FIND_IN_FILES_MAX" : " (showing the first {0} matches)",
"FIND_IN_FILES_MORE_THAN" : "Over ",
"FIND_IN_FILES_PAGING" : "{0}&mdash;{1}",
"FIND_IN_FILES_LESS" : " <a href='#' class='find-less'>Less</a>",
"FIND_IN_FILES_MORE" : " <a href='#' class='find-more'>More</a>",
"FIND_IN_FILES_FILE_PATH" : "File: <span class='dialog-filename'>{0}</span>",
"FIND_IN_FILES_LINE" : "line: {0}",

Expand Down Expand Up @@ -273,7 +275,6 @@ define({
// Strings for main-view.html
"EXPERIMENTAL_BUILD" : "experimental build",
"DEVELOPMENT_BUILD" : "development build",
"SEARCH_RESULTS" : "Search Results",
"OK" : "OK",
"DONT_SAVE" : "Don't Save",
"SAVE" : "Save",
Expand Down
Loading