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

Don't change the selected entry after search if you edit an entry #2129

Merged
merged 1 commit into from
Oct 11, 2016
Merged

Don't change the selected entry after search if you edit an entry #2129

merged 1 commit into from
Oct 11, 2016

Conversation

chriba
Copy link
Contributor

@chriba chriba commented Oct 6, 2016

Fixes: koppor#172.
Edit: Fixes #2142.

When the search is active and you edit an entry until the entry doesn't match the search an longer the first match would be selected.

Now, if you edit an entry the selected entry won't change.

@tschechlovdev tschechlovdev added stupro status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers labels Oct 6, 2016
@lenhard
Copy link
Member

lenhard commented Oct 7, 2016

I tested this locally and LGTM!

@chriba chriba changed the title Don't change the selected entry if you edit an entry and the search is active Don't change the selected entry after search if you edit an entry Oct 7, 2016
@chriba
Copy link
Contributor Author

chriba commented Oct 10, 2016

Will also fix #2142.

@koppor koppor merged commit fc9fd67 into JabRef:master Oct 11, 2016
@matthiasgeiger
Copy link
Member

This potentially also fixes #1938, I think.

Siedlerchr added a commit that referenced this pull request Oct 11, 2016
* upstream/master:
  Fix isSharedDatabaseAlreadyPresent check.
  don't change entry after search if editing an entry (#2129)
  Change download URL to downloads.jabref.org (#2145)
  fix switching edited textfield in the entry editor with TAB (#2138)
  Update me.champeau.gradle.jmh' version from 0.3.0 to 0.3.1
  Update install4j plugin from 6.1.2 to 6.1.3
  Remove gradle plugin com.github.youribonnaffe.gradle.format as it is deprecated and the config uses a non-existing file
  Update gradle from 3.0 to 3.1
  Fix changing the font size not working when importing preferences (#2069)
  select whole word when selecting search bar (#2149)
@chriba chriba deleted the editingWhileActiveSearch branch October 13, 2016 14:05
Siedlerchr added a commit that referenced this pull request Oct 13, 2016
* upstream/master: (24 commits)
  hotfix NPE in the main table (#2158)
  Enhance side pane toggle (#1605)
  Added gray background text to authors field to assist newcomers (#2147)
  Rewrite google scholar fetcher to new infrastructure (#2101)
  Found entries will be shown when dropping a pdf with xmp meta data (#2150)
  Japanese translation (#2155)
  Add shortcuts to context menu (#2131)
  [WIP] Doi resolution ignore (#2154)
  Fix DuplicationChecker and key generator (#2151)
  just close popup on first ESC
  keep entry in sight
  Fix isSharedDatabaseAlreadyPresent check.
  don't change entry after search if editing an entry (#2129)
  Change download URL to downloads.jabref.org (#2145)
  fix switching edited textfield in the entry editor with TAB (#2138)
  Update me.champeau.gradle.jmh' version from 0.3.0 to 0.3.1
  Update install4j plugin from 6.1.2 to 6.1.3
  Remove gradle plugin com.github.youribonnaffe.gradle.format as it is deprecated and the config uses a non-existing file
  Update gradle from 3.0 to 3.1
  Fix changing the font size not working when importing preferences (#2069)
  ...

# Conflicts:
#	src/main/java/net/sf/jabref/gui/externalfiles/DroppedFileHandler.java
#	src/main/java/net/sf/jabref/gui/importer/fetcher/GoogleScholarFetcher.java
zesaro pushed a commit to zesaro/jabref that referenced this pull request Nov 22, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants