Merging master to keep up to date. #1
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
This makes it so the post is only added to the live comments widget if the current view is not a preview solving #26. Adds isPreview to o2.options and to pageMeta. There is a conditional check when adding an item to the live-comments widget to prevent the post being added in a preview.
This PR fixes the net::ERR_CONNECTION_CLOSED issue seen in browsers that support HTTP2.
* Converted the scripts and styles arrays to comma-delimited strings.
* Updated the poll request handler to explode(',') the styles and strings fields into arrays since that's what the rest of the code expects.
* This commit is backwards compatible in the sense that if styles and strings are still arrays, then explode()
gets skipped and everything else works as expected.
O2 request size reduction
Avoid showing drafts in Live Comments widget during post preview, props BE-Webdesign
Changed modelClass to use hash instead of userLogin.
Previously, if you installed O2 by downloading `o2-master.zip` and installed that zip file, it would go into `/wp-content/plugins/o2-master/o2.php` and such -- which this method of specifying the path to assets would fail on. By being more dynamic as to specifying what folder we're in, we'll be more reliable however we're used.
__DIR__ is PHP 5.3+ only, and will not function in PHP 5.2 Where possible, swap it out with a `O2__DIR__` constant for less code churn and easier discoverability later.
Revert "Changed modelClass to use hash instead of userLogin."
This will grant us greater flexibility if we want to move the class to a subfolder at some point.
This is for consistency with the coding styles in the rest of the project.
Adds jshint and phplint, as well as some i18n tools.
We can rely on Core's `$wp_locale` global for this info.
This function got redid in r100098-wpcom but the variable declarations from the old version stuck around. Tidy them up.
Setting up a timeout anonymous function that calls something else that's never re-called is overly complicated.
Fix better asset routing
Add grunt (WIP)
Remove wpcom_filter_long_comments_on_display from checklists so they don't break with long checklists. Props @roccotripaldi
This syncs over r133501-wpcom
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.
Merging master to keep up to date.