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

Infinite Scroll: When we're displaying the last page, don't display both footers. #6312

Merged
merged 2 commits into from
Feb 10, 2017

Conversation

georgestephanis
Copy link
Member

@georgestephanis georgestephanis commented Feb 7, 2017

When we're displaying the last page, don't display both footers.

Fixes #5268
Fixes #5267
Fixes #282
Fixes #5550

Fixes #4345-wpcom-themes
Reviewed at D4291 in Phabricator

Merges r150547-wpcom.

When we're displaying the last page, don't display both footers.

Fixes https://[private link]
Reviewed at https://[private link]

Merges r150547-wpcom.
@eliorivero eliorivero added the [Status] Needs Review This PR is ready for review. label Feb 7, 2017
@eliorivero
Copy link
Contributor

The change works fine in blog view but I found that, unrelated to this, the calculations for other archive views were incorrect. I've added a commit that attempts to solve this.

@georgestephanis
Copy link
Member Author

The initial commit on this resolves #5268, @eliorivero's second commit also resolves #5267 as well.

@eliorivero
Copy link
Contributor

eliorivero commented Feb 9, 2017

Found that this PR also fixes #282 and fixes #5550
To test:

  1. use master branch and search something that doesn't exists. At this time, the loading animation will be briefly visible or if you're using the button to manually load posts, it will be visible.
  2. switch to this branch and search the same thing again. No animation or button will be visible now.

I've updated the PR description to include the issues fixed by this.

@georgestephanis
Copy link
Member Author

LGTM. Can we get another review before merging?

@georgestephanis
Copy link
Member Author

Also, whoever merges this, please do NOT do the squash and merge -- these two commits should be merged without squashing for wpcom syncing.

@zinigor zinigor merged commit b8868c6 into master Feb 10, 2017
@zinigor zinigor removed the [Status] Needs Review This PR is ready for review. label Feb 10, 2017
@zinigor zinigor deleted the wpcom/150547 branch February 10, 2017 14:42
@jeherve jeherve added [Status] Needs Changelog [Status] Needs Testing We need to add this change to the testing call for this month's release labels Feb 10, 2017
@jeherve jeherve added [Status] Has Changelog and removed [Status] Needs Changelog [Status] Needs Testing We need to add this change to the testing call for this month's release labels Feb 20, 2017
jeherve added a commit that referenced this pull request Feb 21, 2017
dereksmart pushed a commit that referenced this pull request Feb 28, 2017
* Changelog: update stable tag and move changelog to changelog.txt

Also remove old releases from readme.txt to keep the changelog tab short.

* Changelog: add #5883

Also update the filter's docblock to match new version.

* Changelog: add #5938

* Changelog: add #6298

* Changelog: add #3405

* Changelog: add #5941

* Changelog: add #6239

* Changelog: add #6281

* Changelog: add #6303

* Changelog: add #6018

* Changelog: add #6300

* Changelog: add #6296

* Changelog: add #6130

* Changelog: add #6292

* Readme: remove extra "on".

* Changelog: add #6307

* Changelog: add #3297

* Changelog: add #6275

* Changelog: add #6321

* Changelog: add #6297

* Readme: update the support forum link anchor.

Anchor changed when WordPress.org forums were updated to bbPress 2

* Readme: update list of a12s, it wasn't up to date anymore!

* Changelog: add #6338

* Changelog: add #6337

* Changelog: add #6335

* Changelog: add #6333

* Testing List: first version of the 4.7 testing list.

* Changelog: add #6332

* Changelog: add #6325

* Changelog: add #6326

* Changelog: add #6339

* Changelog: add #6342

* Changelog: add #6343

* Changelog: add #6346

* Changelog: add #6347

* Changelog: add #6279

* Changelog: add #6306

* Changelog: add #6312

* Changelog: add #6316

* Changelog: add #6171

* Changelog: add #6317

* Changelog: add #6246

* Changelog: add #6263

* Changelog: add #4220

* Changelog: add #5888

* Changelog: add #3406

* Changelog: add #3637

* Changelog: add #6320

* Changelog: add #5992

* Changelog: add #6322

* Changelog: add #6324

* Changelog: add #6352

* Changelog: add #6355

* Changelog: add #6360

* Changelog: add #6362

* Changelog: add #6369, #6382

* Changelog: add #6370

* Changelog: add #6375

* Changelog: add #6383

* Changelog: add #6384

* Changelog: add #6386

* Changelog: add #6395

* Changelog: add #6403

* Changelog: add #6406

* Changelog: add #6418

* Changelog: add #6419

* Changelog: add #6434

* Changelog: add #6446

* Changelog: add #6006

* Changelog: add #6096

* Changelog: add #6399

* Changelog: fix typo.

@see #6331 (comment)

* Changelog: add #6440

* Changelog: add #6443

* Changelog: add #6445

* Changelog: add #6463

* Changelog: add #6468

* Changelog: add #6471

* Changelog: add #6474

* Changelog: add #6480

* Changelog: add #6497

* Changelog: add #6499

* Changelog: add #6514

* Changelog: add #6267

* Changelog: add #5940

* Changelog: add #6492

* Changelog: add #5281

* Changelog: add #6327

* Changelog: add #6451

* Changelog: add #6525

* Changelog: add #6530
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants