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

Issue #11261: keep the search bar open #14141

Merged
merged 27 commits into from
Mar 2, 2018
Merged

Issue #11261: keep the search bar open #14141

merged 27 commits into from
Mar 2, 2018

Conversation

petetnt
Copy link
Collaborator

@petetnt petetnt commented Mar 2, 2018

See #11996

This PR adds additional test fix which seems to have occurred during merge/rebase

thejackhammer and others added 27 commits September 12, 2015 16:23
…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
…/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
… until I can confirm with a Quebecois at work
Signed-off-by: petetnt <pete.a.nykanen@gmail.com>
@petetnt petetnt merged commit 32300dc into master Mar 2, 2018
@petetnt petetnt deleted the petetnt/search-close branch March 2, 2018 14:56
ficristo pushed a commit to quadre-code/quadre that referenced this pull request Dec 26, 2018
* 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 <pete.a.nykanen@gmail.com>
ficristo pushed a commit to quadre-code/quadre that referenced this pull request Dec 26, 2018
* 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 <pete.a.nykanen@gmail.com>
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.

2 participants