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

[OPEN] Find in Files Improvements (Part 1: Templates)#3324

Merged
dangoor merged 2 commits intoadobe:masterfrom
TomMalbran:tom/find-in-files-p1
Jun 20, 2013
Merged

[OPEN] Find in Files Improvements (Part 1: Templates)#3324
dangoor merged 2 commits intoadobe:masterfrom
TomMalbran:tom/find-in-files-p1

Conversation

@TomMalbran
Copy link
Copy Markdown
Contributor

As I mentioned in #3151 I am going to simplify the review and test tasks by splitting the pull request into smaller steps.

For this first part I just changed the jQuery html creation with Mustache templates for the search dialog and results, and added a row selection like JSLint uses. There might be a problem with the selection color since the highlighted query and the selected row use the same color, but since the search query is also selected in the document, this might not be that big of an issue. If it is, we could change the color for one of them, or use a different color for the highlighted query when a row is selected.

@jasonsanjose
Copy link
Copy Markdown
Member

Tagging open. Due to the string change, we'll wait to take this in sprint 25. Please do not merge in sprint 24.

@dangoor
Copy link
Copy Markdown
Contributor

dangoor commented Jun 13, 2013

Hi @TomMalbran . Sorry we didn't get to this sooner. If you don't mind updating the pull request to the latest master, I'll take a look during sprint 27

@ghost ghost assigned dangoor Jun 13, 2013
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is actually the old search-results.html, but renamed so I could use the results name for the results table.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this panel only used by find in files? I'm wondering if we only need one template rather than two (the new search-results.html template get's merged in where {{SEARCH_RESULTS}} appears in this template)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This panel is only used for find in files currently, but could eventually be used for something else later (like replace all).

This template is used to create one time only a panel to place the results in. Once it is created on start up is not used anymore. The content template is used after every search, so merging both templates would require to destroy the current panel and re-create it after each search, and once paging is added, for every new page. I think that the current solution using 2 templates is cleaner.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

OK, that seems reasonable. Thanks for the explanation!

@TomMalbran
Copy link
Copy Markdown
Contributor Author

@dangoor Thanks for getting this request. I just merged the code, and checked that everything stills works ok, but there were several conflicts, so I hope I didn't broke anything.

@dangoor
Copy link
Copy Markdown
Contributor

dangoor commented Jun 19, 2013

Other than the one question that I have about two templates vs. one, I'm all done with review. This looks like a nice cleanup!

dangoor added a commit that referenced this pull request Jun 20, 2013
[OPEN] Find in Files Improvements (Part 1: Templates)
@dangoor dangoor merged commit c8284ff into adobe:master Jun 20, 2013
@TomMalbran TomMalbran deleted the tom/find-in-files-p1 branch June 20, 2013 21:05
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants