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

Improve file filter #147

Merged
merged 3 commits into from Apr 14, 2016

Conversation

Projects
None yet
4 participants
@will-moore
Member

will-moore commented Apr 5, 2016

This improves the filtering of figure files in the File > Open dialog as discussed at #146.

To test:

  • Open the File > Open dialog
  • Try filtering the files with multiple words as discussed in #146
  • Files should appear in the filtered list if all search words are found in the figure name, regardless of order - splitting words on white-space.
@snoopycrimecop

This comment has been minimized.

Show comment
Hide comment
@snoopycrimecop

snoopycrimecop Apr 5, 2016

Member

Conflicting PR. Removed from build FIGURE-merge#125. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js
Member

snoopycrimecop commented Apr 5, 2016

Conflicting PR. Removed from build FIGURE-merge#125. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js
@snoopycrimecop

This comment has been minimized.

Show comment
Hide comment
@snoopycrimecop

snoopycrimecop Apr 6, 2016

Member

Conflicting PR. Removed from build FIGURE-merge#126. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js
Member

snoopycrimecop commented Apr 6, 2016

Conflicting PR. Removed from build FIGURE-merge#126. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js
@snoopycrimecop

This comment has been minimized.

Show comment
Hide comment
@snoopycrimecop

snoopycrimecop Apr 7, 2016

Member

Conflicting PR. Removed from build FIGURE-merge#127. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js
Member

snoopycrimecop commented Apr 7, 2016

Conflicting PR. Removed from build FIGURE-merge#127. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js

@will-moore will-moore referenced this pull request Apr 10, 2016

Merged

File open dialog #145

@snoopycrimecop

This comment has been minimized.

Show comment
Hide comment
@snoopycrimecop

snoopycrimecop Apr 10, 2016

Member

Conflicting PR. Removed from build FIGURE-merge#128. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js
Member

snoopycrimecop commented Apr 10, 2016

Conflicting PR. Removed from build FIGURE-merge#128. See the console output for more details.
Possible conflicts:

  • PR #145 will-moore 'File open dialog'
    • static/figure/figure.js
@pwalczysko

This comment has been minimized.

Show comment
Hide comment
@pwalczysko

pwalczysko Apr 12, 2016

Member

Works as expected. Tested with the example delivered by the external user in #146. Ready to mrege.

Member

pwalczysko commented Apr 12, 2016

Works as expected. Tested with the example delivered by the external user in #146. Ready to mrege.

@jburel

This comment has been minimized.

Show comment
Hide comment
@jburel

jburel Apr 14, 2016

Member

Will be possible to create a common method instead of having the same code twice?

Member

jburel commented Apr 14, 2016

Will be possible to create a common method instead of having the same code twice?

@will-moore

This comment has been minimized.

Show comment
Hide comment
@will-moore

will-moore Apr 14, 2016

Member

You're seeing the code changes twice because the concatenated js file is also committed.

Member

will-moore commented Apr 14, 2016

You're seeing the code changes twice because the concatenated js file is also committed.

@jburel

This comment has been minimized.

Show comment
Hide comment
@jburel

jburel Apr 14, 2016

Member

I see. Missed that

Member

jburel commented Apr 14, 2016

I see. Missed that

@jburel jburel merged commit 6f8a598 into ome:master Apr 14, 2016

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment