Resolve divergence in file: whitespace #9469
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Resolve divergences from Jetpack as well for related files. Fixes #7133. Merges r133276-wpcom.
Merges r133288-wpcom.
Reported in Slack: https://a8c.slack.com/archives/triage/p1459368181000158 Jetpack related change: 36e529d Merges r133533-wpcom.
Summary: @michiecat mentioned today that a client was having an issue where opening a gallery, closing a gallery, and then clicking the back button was reopening the gallery. It looks like we have fixed this in Jetpack, but we need to sync those changes back to WPCOM so our WP.com and VIP users can get those changes. Test Plan: Check out patch. Sandbox site. Open gallery. Navigate through slides. Close gallery. Hit back button. Gallery should not open. **Bonus feature** Single images linked to the attachment URL should now open in a lightbox. via #5469 Reviewers: samhotchkiss, dereksmart, eliorivero Reviewed By: dereksmart, eliorivero Differential Revision: https://[private link] Merges r147170-wpcom.
Summary: This merges this commit to the css file - adbde22 It also includes manual resolution for the divergent files: - `mu-plugins/carousel/jetpack-carousel.php` - significant commits: - #5469 - 728c96f - 4b70301 - 7fc7ebd - b4ad963 - adbde22 - `mu-plugins/carousel/jetpack-carousel.js` - significant commits: - #8329 - #7943 - #8509 Test Plan: Steps: - Add an gallery widget to a site. - Click on an image in the gallery - The carousel should open and the navigation should work as expect. - Check the dev console for any JS errors Reviewers: dereksmart, zinigor Reviewed By: zinigor Subscribers: zinigor, brbrr, dereksmart Differential Revision: https://[private link] Merges r174217-wpcom.
Conflicts: modules/carousel/jetpack-carousel.js
dereksmart
added
[Feature] Carousel
ghost
removed
the
[Status] Ready to Merge
oskosk
added
the
[Status] Ready to Merge
ghost
removed
the
[Status] Ready to Merge
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Only whitespace changes