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.

Sign up for GitHub

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

Jump to bottom

Admin Page: Don't load w.js until it's necessary #8251

Merged
merged 1 commit into from
Nov 27, 2017
Merged

Admin Page: Don't load w.js until it's necessary #8251

merged 1 commit into from
Nov 27, 2017

Conversation

oskosk
Copy link
Contributor

@oskosk oskosk commented Nov 27, 2017

Changes proposed in this Pull Request:

  • Updates the check to see whether we need to load w.js to also check if the site is connected.

Testing instructions:

  • On a disconnected Jetpack with the changes proposed here.
  • Get to the Jetpack's Admin Page. View the source code.
  • Verify w.js is not loaded.

@oskosk oskosk added [Status] Needs Review This PR is ready for review. [Type] Janitorial labels Nov 27, 2017
@oskosk oskosk requested a review from a team as a code owner November 27, 2017 17:56
@oskosk oskosk changed the title Admin Page Don't load w.js until it's necessary Admin Page: Don't load w.js until it's necessary Nov 27, 2017
dereksmart
dereksmart approved these changes Nov 27, 2017
View reviewed changes
Copy link
Member

@dereksmart dereksmart left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍 thanks!

@dereksmart dereksmart added [Status] Ready to Merge Go ahead, you can push that green button! and removed [Status] Needs Review This PR is ready for review. labels Nov 27, 2017
@oskosk
Copy link
Contributor Author

oskosk commented Nov 27, 2017

Props to @jeherve and @georgestephanis for this one

@dereksmart dereksmart merged commit 3a743c2 into master Nov 27, 2017
@dereksmart dereksmart deleted the fix/noload-script branch November 27, 2017 18:14
@dereksmart dereksmart removed the [Status] Ready to Merge Go ahead, you can push that green button! label Nov 27, 2017
jeherve added a commit that referenced this pull request Nov 28, 2017
@jeherve
Changelog: add #8251
4721107
oskosk pushed a commit that referenced this pull request Nov 28, 2017
@jeherve @oskosk
Changelog 5.6: running changelog. (#8192)
7844644 
* Changelog 5.6: create base for changelog.

* Update changelog with 5.5.1 info.

* Changelog: add #7930 and #8238

* Changelog: add #8076

* Changelog: add #8100

* Changelog: add #8117

* Changelog: add #8141

* Changelog: add #8143

* Changelog: add #8147

* Changelog: add #8149

* Changelog: add #8153

* Changelog: add #8173

* Changelog: add #8184

* Changelog: add #8196

* Changelog: add #8199

* Changelog: add #8093

* Changelog: add #8171

* Changelog: add #8182

* Changelog: add #8202, #8222

* Changelog: add #8228

* Changelog: add #8240

* Changelog: add #8251

* remove AL card change
@oskosk oskosk added this to the 5.6 milestone Dec 8, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dereksmart dereksmart dereksmart approved these changes

@zinigor zinigor Awaiting requested review from zinigor

@jeherve jeherve Awaiting requested review from jeherve

Assignees
No one assigned
Labels
[Type] Janitorial
Projects
None yet
Milestone
5.6
Development

Successfully merging this pull request may close these issues.
3 participants
@oskosk @dereksmart @jeherve