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

Leaflet upgrade for master #679

Merged
merged 3 commits into from
Aug 1, 2018
Merged

Conversation

ewlarson
Copy link
Member

  • Bump leaflet-rails, esri-leaflet, and leaflet-iiif to their most current release versions
  • Fix upgrade issues for the opacity slider
  • Make small leaflet api adjustments for esri viewer
  • Set index_map labels natively
  • Drop leaflet-label-src dependency

@ewlarson ewlarson mentioned this pull request Jul 31, 2018
@coveralls
Copy link

coveralls commented Jul 31, 2018

Coverage Status

Coverage decreased (-0.008%) to 96.444% when pulling daf98c2 on leaflet-upgrade-for-master into b620f9c on master.

@eliotjordan
Copy link
Member

@ewlarson This PR needs a rebase to get the circle ci running.

@mejackreed
Copy link
Member

Do we want to ship a 1.9 release without the breaking changes first?

@eliotjordan
Copy link
Member

@mejackreed Are suggesting this should be a 1.10 release or it should released as part of 2.0 with the blacklight 7 updates?

@ewlarson
Copy link
Member Author

ewlarson commented Aug 1, 2018

@mejackreed What changes here break current functionality?
@eliotjordan was hoping this would make the 1.9 release, assuming 2.0 is BL7 support.

@mejackreed
Copy link
Member

I was thinking about the leaflet version upgrade potentially being troublesome for some. Perhaps its not though.

@ewlarson
Copy link
Member Author

ewlarson commented Aug 1, 2018

I believe all Geoblacklight leaflet/map functionality is unbroken here -- test suite items are good. If you've added a third-party fullscreen plugin or otherwise, those may potentially break, but you've committed yourself to that path already.

Eric Larson added 3 commits August 1, 2018 10:31
* Bump leaflet-rails, esri-leaflet, and leaflet-iiif to their most current release versions
* Fix upgrade issues for the opacity slider
* Make small leaflet api adjustments for esri viewer
* Drop leaflet-label-src dependency
* Set index_map labels natively
Fixes #557

For AJAX POST requests, we need to pass along Rails' CSRF token in Rails 5.1+
@eliotjordan
Copy link
Member

I'm not sure what was up with CI, so I rebased again and force pushed. Hopefully that helps.

@jrgriffiniii jrgriffiniii requested review from jrgriffiniii and removed request for jrgriffiniii August 1, 2018 16:56
@eliotjordan eliotjordan merged commit ad1ef63 into master Aug 1, 2018
@eliotjordan eliotjordan deleted the leaflet-upgrade-for-master branch August 1, 2018 17:28
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.

None yet

4 participants