Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Keep the search bar open #154

Merged
merged 1 commit into from
Dec 26, 2018
Merged

Keep the search bar open #154

merged 1 commit into from
Dec 26, 2018

Conversation

ficristo
Copy link
Member

Backport adobe#14141

* It fixes issue adobe#11261 by preventing  the search bar from closing as a result of clicking in the main editor. This is done by commenting out the code in line 256. The search bar will also close when the ESC key is pressed while the main editor has focus

* Commented out unnecessary code around line 256

* [issue#11261] * Added in a menu option to allow find bar to stay open/automatically close
* Add a close icon to the search bar (for completeness)
* Fix escape key for in-editor searches
* Remember last search phrase if no selection for in-editor searches

* [issue#11261] Code clean up of initial mistakes of the previous commit

* [issue#11261] Strange issue with spacing in src/nls/fr/strings.js...

* [issue#11261] Strange issue with spacing in src/nls/fr/strings.js...

* [issue#11261] Further merge conflict resolution and clean up

* [issue#11261] Fix to branch and to testing

* [issue#11261] Fixes for incorrect regexp processing

* [issue#11261] Why does JSLint keep changing its own file

* [issue#11261] Not sure about the french one, let's exclude it for now until I can confirm with a Quebecois at work

* [issue#11261] Test left test file with change...

* [issue adobe#11261] Minor fixes as per conversation of pull request

* [Issue adobe#11261] Fixes mainly to the regular expression side of things

* [Issue adobe#11261] Revert accidental change in JSLint

* [issue adobe#11261] Remove loosy TODO and wording consistency change

* [Issue adobe#11261] Remove Find Next on 'Find' option (we already have Find Next)

* [Issue adobe#11261] (Retry the Travis CI build)

* Totally forgot to actually save the merge conflict resolution. Here it is.

* Merged master incorrectly - fix bad merge

* Fix test

Signed-off-by: petetnt <[email protected]>
@ficristo ficristo merged commit d8acb74 into master Dec 26, 2018
@ficristo ficristo deleted the feature/search-bar branch December 26, 2018 15:28
ficristo added a commit that referenced this pull request Dec 26, 2018
ficristo added a commit that referenced this pull request Dec 26, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants